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

Simple merge
Simple merge