]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit - drivers/input/touchscreen/Makefile
Merge commit 'v2.6.27-rc1' into x86/microcode
authorIngo Molnar <mingo@elte.hu>
Tue, 29 Jul 2008 09:54:24 +0000 (11:54 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 29 Jul 2008 09:54:24 +0000 (11:54 +0200)
commit3825c9e8d01e4310c40a3903a354c433c32a7b6f
tree87c94a8076bbb38bd2cf20ab9bc23d6f74f6a0a8
parent5d7b605245b1aa1a9cd6549b1f57d69273eb0c37
parent6e86841d05f371b5b9b86ce76c02aaee83352298
Merge commit 'v2.6.27-rc1' into x86/microcode

Conflicts:

arch/x86/kernel/microcode.c

Manual resolutions:

arch/x86/kernel/microcode_amd.c
arch/x86/kernel/microcode_intel.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
MAINTAINERS
arch/x86/Kconfig
arch/x86/kernel/microcode.c
arch/x86/kernel/microcode_amd.c
arch/x86/kernel/microcode_intel.c