Merge branch 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 22 Apr 2010 18:15:33 +0000 (11:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 22 Apr 2010 18:15:33 +0000 (11:15 -0700)
commit36c48f8cc5fc0558c1109a84b0832a26c384d8f1
treed88904ac2960e3d7498cfeed25145834cb7a62fd
parent1482338f6242dbaea46039c5f1b4604a472b364b
parent7f3c1fa4c3f52ef65005ae5162e5173e875b8c0c
Merge branch 'slabh' of git://git./linux/kernel/git/tj/misc

* 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc:
  uml: Fix build breakage after slab.h changes