tree 3094ef42787b8e0c900bce1f2391ced081ed1ba4
parent 9e74e7c81a24aee66024fc477786bd1de84e293b
parent a32f3926632e71c8aa23ce32fe2625f8d5f792c2
author Linus Torvalds <torvalds@linux-foundation.org> 1270485551 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1270485551 -0700

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