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

View file

@ -15,7 +15,7 @@
#include <linux/cpu.h>
#include <linux/device.h>
#include <linux/swap.h>
#include <linux/gfp.h>
#include <linux/slab.h>
static struct sysdev_class_attribute *node_state_attrs[];