2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-25 07:06:40 +08:00
linux-next/arch
Linus Torvalds 6b8212a313 Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 updates from Ingo Molnar.

This touches some non-x86 files due to the sanitized INLINE_SPIN_UNLOCK
config usage.

Fixed up trivial conflicts due to just header include changes (removing
headers due to cpu_idle() merge clashing with the <asm/system.h> split).

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/apic/amd: Be more verbose about LVT offset assignments
  x86, tls: Off by one limit check
  x86/ioapic: Add io_apic_ops driver layer to allow interception
  x86/olpc: Add debugfs interface for EC commands
  x86: Merge the x86_32 and x86_64 cpu_idle() functions
  x86/kconfig: Remove CONFIG_TR=y from the defconfigs
  x86: Stop recursive fault in print_context_stack after stack overflow
  x86/io_apic: Move and reenable irq only when CONFIG_GENERIC_PENDING_IRQ=y
  x86/apic: Add separate apic_id_valid() functions for selected apic drivers
  locking/kconfig: Simplify INLINE_SPIN_UNLOCK usage
  x86/kconfig: Update defconfigs
  x86: Fix excessive MSR print out when show_msr is not specified
2012-03-29 14:28:26 -07:00
..
alpha Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
arm MMC highlights for 3.4: 2012-03-28 20:59:45 -07:00
avr32 Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
blackfin Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
c6x Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
cris Delete all instances of asm/system.h 2012-03-28 18:30:03 +01:00
frv Delete all instances of asm/system.h 2012-03-28 18:30:03 +01:00
h8300 Delete all instances of asm/system.h 2012-03-28 18:30:03 +01:00
hexagon Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
ia64 Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2012-03-29 14:16:48 -07:00
m32r Delete all instances of asm/system.h 2012-03-28 18:30:03 +01:00
m68k Delete all instances of asm/system.h 2012-03-28 18:30:03 +01:00
microblaze Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
mips Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2012-03-29 14:28:26 -07:00
mn10300 Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
openrisc Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
parisc Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
powerpc irqdomain/powerpc: updated defconfigs for VIRQ_DEBUG rename 2012-03-29 14:31:20 -06:00
s390 Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
score Delete all instances of asm/system.h 2012-03-28 18:30:03 +01:00
sh Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
sparc Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
tile Merge branch 'akpm' (Andrew's patch-bomb) 2012-03-28 17:19:28 -07:00
um Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
unicore32 Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
x86 Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2012-03-29 14:28:26 -07:00
xtensa Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2012-03-29 14:28:26 -07:00
.gitignore
Kconfig nmi watchdog: do not use cpp symbol in Kconfig 2012-03-23 16:58:31 -07:00