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: ae1a25d 432dc14)

commit	e4cc8fca1c77905bce91b42a1372d4a73069a529
author	Russell King <rmk@dyn-67.arm.linux.org.uk>
	Sat, 7 Feb 2009 21:43:28 +0000 (7 21:43 +0000)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Sat, 7 Feb 2009 21:43:28 +0000 (7 21:43 +0000)
tree	56897b891842ff3f52536c51dfc82a579e718713	tree \| snapshot (tar.gz zip)
parent	ae1a25da8448271a99745da03100d5299575a269	commit \| diff
parent	432dc14fa40dea427d9ed476965001a816ff833b	commit \| diff

Merge branch 'devel' of git://git./linux/kernel/git/ycmiao/pxa-linux-2.6 into devel

Conflicts:

arch/arm/configs/magician_defconfig

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/configs/em_x270_defconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/configs/magician_defconfig	diff1 \|	diff2 \|	blob \| history

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