Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Mar 2011 01:30:32 +0000 (17:30 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Mar 2011 01:30:32 +0000 (17:30 -0800)
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/nouveau: allocate kernel's notifier object at end of block


Trivial merge