Public Git Hosting - linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 2631182 85d6943)

commit	42578c82e0f1810a07ebe29cb05e874893243d8c
author	Russell King <rmk@dyn-67.arm.linux.org.uk>
	Thu, 11 Jun 2009 14:35:00 +0000 (11 15:35 +0100)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Thu, 11 Jun 2009 14:35:00 +0000 (11 15:35 +0100)
tree	e2a3811677d3594e891fc82c940438f6b6abc3e0	tree \| snapshot (tar.gz zip)
parent	2631182bf93919577730e6a6c4345308db590057	commit \| diff
parent	85d6943af50537d3aec58b967ffbd3fec88453e9	commit \| diff

Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6 into devel

Conflicts:
arch/arm/Kconfig
arch/arm/kernel/smp.c
arch/arm/mach-realview/Makefile
arch/arm/mach-realview/platsmp.c

arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/entry-armv.S	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/smp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/platsmp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/Kconfig	diff1 \|	diff2 \|	blob \| history

Linux 2.6 ibm-acpi/thinkpad-acpi driver git tree