From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 22 Apr 2010 18:15:33 +0000 (-0700)
Subject: Merge branch 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc
X-Git-Tag: v2.6.34-rc6~66
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=36c48f8cc5fc0558c1109a84b0832a26c384d8f1

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

* 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc:
  uml: Fix build breakage after slab.h changes
---

36c48f8cc5fc0558c1109a84b0832a26c384d8f1