]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge branch 'x86/urgent' into x86/core
authorIngo Molnar <mingo@elte.hu>
Sat, 26 Jul 2008 14:30:19 +0000 (16:30 +0200)
committerIngo Molnar <mingo@elte.hu>
Sat, 26 Jul 2008 14:30:19 +0000 (16:30 +0200)
commit10d3285d0b3af641ee446f0be8f0a7f40cb515b6
tree836ad323a1eae8a4bdd5ab5f5e4271efeb85cf8c
parent6dec3a10a7a6093af10cef7ac56021150afd6451
parent3a61ec387c9092dfc91a5959145d36835a72fc4c
Merge branch 'x86/urgent' into x86/core

Conflicts:

include/asm-x86/gpio.h

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/Kconfig
include/asm-x86/gpio.h
include/asm-x86/mach-summit/mach_apic.h