Merge branch 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 7 Apr 2010 15:38:27 +0000 (08:38 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 7 Apr 2010 15:38:27 +0000 (08:38 -0700)
commit6948ec70355ae6cf6082519e3d76b280373dade1
tree5fa9bba0397d70958ec58a5d547dc8f7f06b9f9d
parentcc4fc29e59c386919a7674e203be7822dc968dc0
parent18e5b539b451158be7aae6c390a20f0d3e5b9213
Merge branch 'slabh' of git://git./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