projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1ba7622 322a8b0)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
authorPaul Mundt <lethal@linux-sh.org>
Mon, 8 Aug 2011 04:45:28 +0000 (13:45 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Mon, 8 Aug 2011 04:45:28 +0000 (13:45 +0900)
Conflicts:
drivers/tty/serial/sh-sci.c

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
1  2 
drivers/tty/serial/sh-sci.c patch | diff1 | diff2 | blob | history

diff --cc drivers/tty/serial/sh-sci.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.