From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 7 Apr 2010 15:38:27 +0000 (-0700)
Subject: Merge branch 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc
X-Git-Tag: v3.0~5234
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6948ec70355ae6cf6082519e3d76b280373dade1;p=platform%2Fkernel%2Flinux-amlogic.git

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
---

6948ec70355ae6cf6082519e3d76b280373dade1