Merge branch 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc

* 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc:
  nodemask: include slab.h from drivers/base/node.c
This commit is contained in:
Linus Torvalds 2010-04-07 08:38:27 -07:00
commit 6948ec7035