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: 1c14e6c 815c416)

commit	285eba57db7bd7d7c3c5929fb8621fdcaaea1b00
author	Paul Mundt <lethal@linux-sh.org>
	Mon, 5 Jul 2010 06:46:08 +0000 (5 15:46 +0900)
committer	Paul Mundt <lethal@linux-sh.org>
	Mon, 5 Jul 2010 06:46:08 +0000 (5 15:46 +0900)
tree	a9e7f0563cef296b24c53b20dbb388ec5c210172	tree \| snapshot (tar.gz zip)
parent	1c14e6cecb1811543b1016f27e5d308fbea8c08a	commit \| diff
parent	815c4163b6c8ebf8152f42b0a5fd015cfdcedc78	commit \| diff

Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6

Conflicts:
include/linux/serial_sci.h

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/i2c/busses/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/video/Kconfig	diff1 \|	diff2 \|	blob \| history

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