git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1c14e6c 815c416)
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)
Conflicts:
include/linux/serial_sci.h

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
drivers/i2c/busses/Kconfig patch | diff1 | diff2 | blob | history
drivers/video/Kconfig patch | diff1 | diff2 | blob | history

diff --cc MAINTAINERS
Simple merge
diff --cc drivers/i2c/busses/Kconfig
Simple merge
diff --cc drivers/video/Kconfig
Simple merge
Pandora Kernel Repository