]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'slave-dma/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 4 Nov 2011 02:47:32 +0000 (13:47 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 4 Nov 2011 02:47:32 +0000 (13:47 +1100)
1  2 
drivers/dma/pl330.c
drivers/tty/serial/sh-sci.c

Simple merge
Simple merge