]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge commit 'v2.6.27-rc1' into x86/core
authorIngo Molnar <mingo@elte.hu>
Wed, 30 Jul 2008 17:33:48 +0000 (19:33 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 30 Jul 2008 17:33:48 +0000 (19:33 +0200)
commit15dd859cacf312f606f54502d1f66537a1e5c78c
treee50e125eaa6da83fa715704e53c1bde013d1ef8e
parentb2d9d33412b9d13a40cd314d93ab517950fc5950
parent6e86841d05f371b5b9b86ce76c02aaee83352298
Merge commit 'v2.6.27-rc1' into x86/core

Conflicts:

include/asm-x86/dma-mapping.h
include/asm-x86/namei.h
include/asm-x86/uaccess.h

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/Kconfig
arch/x86/lguest/boot.c
include/asm-x86/device.h
include/asm-x86/dma-mapping.h
include/asm-x86/iommu.h
include/asm-x86/kexec.h
include/asm-x86/kvm_host.h
include/asm-x86/pgtable.h
include/asm-x86/swiotlb.h
include/asm-x86/uaccess.h
kernel/irq/manage.c