From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 5 Apr 2010 16:39:11 +0000 (-0700)
Subject: Merge branch 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc
X-Git-Tag: v2.6.34-rc4~71
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b66696e3c0d8fc01efdbc701eba1276618332cb3;p=pandora-kernel.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:
  eeepc-wmi: include slab.h
  staging/otus: include slab.h from usbdrv.h
  percpu: don't implicitly include slab.h from percpu.h
  kmemcheck: Fix build errors due to missing slab.h
  include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
  iwlwifi: don't include iwl-dev.h from iwl-devtrace.h
  x86: don't include slab.h from arch/x86/include/asm/pgtable_32.h

Fix up trivial conflicts in include/linux/percpu.h due to
is_kernel_percpu_address() having been introduced since the slab.h
cleanup with the percpu_up.c splitup.
---

b66696e3c0d8fc01efdbc701eba1276618332cb3
Reading git-diff-tree failed