]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
projects / ~shefty / rdma-dev.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 12dfc84 e4ac93b)
Merge remote branch 'nouveau/drm-nouveau-fixes' of /ssd/git/drm-nouveau-next into...
authorDave Airlie <airlied@redhat.com>
Tue, 19 Apr 2011 23:21:34 +0000 (09:21 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 19 Apr 2011 23:21:34 +0000 (09:21 +1000)
* 'nouveau/drm-nouveau-fixes' of /ssd/git/drm-nouveau-next:
  drm/nouveau: fix allocation of notifier object
  drm/nouveau: fix notifier memory corruption bug
  drm/nouveau: fix pinning of notifier block
  drm/nouveau: populate ttm_alloced with false, when it's not
  drm/nouveau: fix nv30 pcie boards
  drm/nouveau: split ramin_lock into two locks, one hardirq safe


Trivial merge
RDMA kernel development