]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'slave-dma/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Oct 2011 01:25:10 +0000 (12:25 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Oct 2011 01:25:10 +0000 (12:25 +1100)
1  2 
drivers/tty/serial/sh-sci.c

Simple merge