commit | 6948ec70355ae6cf6082519e3d76b280373dade1 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Apr 07 08:38:27 2010 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Apr 07 08:38:27 2010 -0700 |
tree | 5fa9bba0397d70958ec58a5d547dc8f7f06b9f9d | |
parent | cc4fc29e59c386919a7674e203be7822dc968dc0 [diff] | |
parent | 18e5b539b451158be7aae6c390a20f0d3e5b9213 [diff] |
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