]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit66fe0d5f6a8e34943af1255186faef1af59c26ca
treec5060ca5786ef353e005dae04b61d2c49967284d
parent9b4fc1df74523eac9304394ae8af6580af0b004d
parent9e10edc900254f4f9daf9d38cac9f78166dcb7bd
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into sh-latest

Conflicts:
drivers/tty/serial/sh-sci.c

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
drivers/tty/serial/sh-sci.c