Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
authorPaul Mundt <lethal@linux-sh.org>
Wed, 26 Jan 2011 09:23:27 +0000 (18:23 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Wed, 26 Jan 2011 09:23:27 +0000 (18:23 +0900)
commit6b620478e58677bb3f4ec884abb29ef9d68c7821
tree7a438fc5412587f9bd9b907d4d423ea52a498006
parent906b17dc089f7fa87e37a9cfe6ee185efc90e0da
parent6fb1b304255efc5c4c93874ac8c066272e257e28
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6 into common/serial-rework
drivers/tty/serial/sh-sci.c
drivers/tty/serial/sh-sci.h