]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorPaul Mundt <lethal@linux-sh.org>
Mon, 5 Jul 2010 06:46:08 +0000 (15:46 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Mon, 5 Jul 2010 06:46:08 +0000 (15:46 +0900)
commit285eba57db7bd7d7c3c5929fb8621fdcaaea1b00
treea9e7f0563cef296b24c53b20dbb388ec5c210172
parent1c14e6cecb1811543b1016f27e5d308fbea8c08a
parent815c4163b6c8ebf8152f42b0a5fd015cfdcedc78
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:
include/linux/serial_sci.h

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
MAINTAINERS
drivers/i2c/busses/Kconfig
drivers/video/Kconfig