Thomas Gleixner f384c954c9 Merge branch 'linus' into perf/core ... Reason: Further changes conflict with upstream fixes Signed-off-by: Thomas Gleixner <tglx@linutronix.de>		2010-06-28 22:33:24 +02:00
..
boot	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
include/asm	Merge branch 'linus' into perf/core	2010-06-28 22:33:24 +02:00
kernel	alpha: Detect Super IO chip, no IDE on Avanti, enable EPP19	2010-06-15 14:19:08 -04:00
lib	remove __attribute_used__	2008-01-28 23:21:18 +01:00
math-emu	Revert "endian: #define __BYTE_ORDER"	2010-05-26 08:30:15 -07:00
mm	alpha: invoke oom-killer from page fault	2010-05-26 00:40:28 +02:00
oprofile	oprofile: more whitespace fixes	2008-10-15 20:55:51 +02:00
defconfig	alpha/parisc: remove config variable DEBUG_RWLOCK	2008-02-06 10:41:03 -08:00
Kconfig	alpha: use asm-generic/scatterlist.h	2010-05-27 09:12:54 -07:00
Kconfig.debug	alpha/parisc: remove config variable DEBUG_RWLOCK	2008-02-06 10:41:03 -08:00
Makefile	alpha: link failure fix	2008-06-20 16:46:10 -07:00