Merge pull request #5 from polachok/newmaster
commit05fc1a32334e560fe52bfc2d73290952465f4b50
authorcbergstrom <cbergstrom@pathscale.com>
Fri, 3 Aug 2012 03:46:02 +0000 (2 20:46 -0700)
committercbergstrom <cbergstrom@pathscale.com>
Fri, 3 Aug 2012 03:46:02 +0000 (2 20:46 -0700)
tree38c7a95db1296c7125c117e04f862d58c95ffe1e
parentd0bdb2ff6a514c384556bacadcb4196dbc55e11c
parent8a59ccbf054aa595ca5dc3fc2a25cb5ef1c68456
Merge pull request #5 from polachok/new

Mostly FreeBSD fixes
pscnv/nouveau_state.c