linux/arch/s390
Ingo Molnar a2e7127153 Merge commit 'v2.6.32-rc6' into perf/core
Conflicts:
	tools/perf/Makefile

Merge reason: Resolve the conflict, merge to upstream and merge in
              perf fixes so we can add a dependent patch.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-11-04 11:59:45 +01:00
..
appldata sysctl: remove "struct file *" argument of ->proc_handler 2009-09-24 07:21:04 -07:00
boot kbuild: use INSTALLKERNEL to select customized installkernel script 2009-09-20 12:18:14 +02:00
crypto crypto: sha-s390 - Fix warnings in import function 2009-09-05 16:27:35 +10:00
hypfs [S390] hypfs: Use subcode 6 if subcode 7 is not available 2009-10-14 12:43:52 +02:00
include/asm [S390] cputime: fix overflow on 31 bit systems 2009-10-29 15:05:13 +01:00
kernel Merge commit 'v2.6.32-rc6' into perf/core 2009-11-04 11:59:45 +01:00
kvm KVM: s390: fix memsize >= 4G 2009-10-04 13:57:23 +02:00
lib [S390] Add EX_TABLE for addressing exception in usercopy functions. 2009-10-06 10:35:10 +02:00
math-emu [S390] remove -traditional 2008-04-30 13:38:44 +02:00
mm [S390] fix build breakage with CONFIG_AIO=n 2009-10-06 10:35:05 +02:00
oprofile Combine instrumentation menus in kernel/Kconfig.instrumentation 2007-10-19 11:53:54 -07:00
Kconfig perf: Do the big rename: Performance Counters -> Performance Events 2009-09-21 14:28:04 +02:00
Kconfig.debug generic debug pagealloc: build fix 2009-04-02 19:04:48 -07:00
Makefile [S390] hibernation: merge files and move to kernel/ 2009-09-11 10:29:45 +02:00
defconfig [S390] Update default configuration. 2009-09-22 22:58:46 +02:00