linux_dsm_epyc7002/arch
Ingo Molnar 416dfdcdb8 Merge commit 'v2.6.30-rc3' into tracing/hw-branch-tracing
Conflicts:
	arch/x86/kernel/ptrace.c

Merge reason: fix the conflict above, and also pick up the CONFIG_BROKEN
              dependency change from upstream so that we can remove it
	      here.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-04-24 10:11:23 +02:00
..
alpha FRV: Fix the section attribute on UP DECLARE_PER_CPU() 2009-04-21 19:39:59 -07:00
arm clocksource: pass clocksource to read() callback 2009-04-21 13:41:47 -07:00
avr32 clocksource: pass clocksource to read() callback 2009-04-21 13:41:47 -07:00
blackfin clocksource: pass clocksource to read() callback 2009-04-21 13:41:47 -07:00
cris tty: Use the generic RS485 ioctl on CRIS 2009-04-07 08:44:05 -07:00
frv frv: insert PCI root bus resources for the MB93090 devel motherboard 2009-04-21 13:41:50 -07:00
h8300 Get rid of final remnants of include/asm-$(ARCH) 2009-04-17 09:59:27 -07:00
ia64 FRV: Fix the section attribute on UP DECLARE_PER_CPU() 2009-04-21 19:39:59 -07:00
m32r m32r: move include/asm-m32r/* to arch/m32r/include/asm/ 2009-04-17 10:50:23 +09:00
m68k Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2009-04-05 11:04:19 -07:00
m68knommu clocksource: pass clocksource to read() callback 2009-04-21 13:41:47 -07:00
microblaze microblaze: remove duplicated #include's 2009-04-14 11:09:15 +02:00
mips clocksource: pass clocksource to read() callback 2009-04-21 13:41:47 -07:00
mn10300 MN10300: Stop gcc from generating uninitialised variable warnings after BUG() 2009-04-15 13:55:13 -07:00
parisc Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6 2009-04-03 09:52:04 -07:00
powerpc clocksource: pass clocksource to read() callback 2009-04-21 13:41:47 -07:00
s390 clocksource: pass clocksource to read() callback 2009-04-21 13:41:47 -07:00
sh clocksource: pass clocksource to read() callback 2009-04-21 13:41:47 -07:00
sparc clocksource: pass clocksource to read() callback 2009-04-21 13:41:47 -07:00
um uml: kill a kconfig warning 2009-04-21 13:41:50 -07:00
x86 Merge commit 'v2.6.30-rc3' into tracing/hw-branch-tracing 2009-04-24 10:11:23 +02:00
xtensa Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2009-04-05 11:04:19 -07:00
.gitignore
Kconfig mutex: have non-spinning mutexes on s390 by default 2009-04-09 19:28:24 +02:00