]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'tty/tty-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 2 Nov 2012 03:59:46 +0000 (14:59 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 2 Nov 2012 03:59:46 +0000 (14:59 +1100)
1  2 
arch/x86/platform/ce4100/ce4100.c

Simple merge