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

commit	8a3e1c670e503ddd6f6c373b307f38b783ee3a50
author	Paul Mackerras <paulus@samba.org>
	Mon, 9 Jun 2008 02:19:41 +0000 (9 12:19 +1000)
committer	Paul Mackerras <paulus@samba.org>
	Mon, 9 Jun 2008 02:19:41 +0000 (9 12:19 +1000)
tree	03094e8425b750d2693a271ebc89b49312e5476a	tree \| snapshot (tar.gz zip)
parent	e026892c85571e12f11abffde5a90bcc704d663e	commit \| diff
parent	60d5019be8acef268f4676d229c490186d338fbc	commit \| diff

Merge branch 'merge'

Conflicts:

arch/powerpc/sysdev/fsl_soc.c

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

arch/powerpc/boot/Makefile	diff1 \|	diff2 \|	blob \| history
arch/powerpc/boot/dts/mpc8610_hpcd.dts	diff1 \|	diff2 \|	blob \| history
arch/powerpc/sysdev/fsl_soc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/Kconfig	diff1 \|	diff2 \|	blob \| history