]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 's5p/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 15 Nov 2011 22:59:10 +0000 (09:59 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 15 Nov 2011 22:59:10 +0000 (09:59 +1100)
1  2 
drivers/tty/serial/Kconfig

Simple merge