]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'tty/tty-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 29 Oct 2012 02:21:38 +0000 (13:21 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 29 Oct 2012 02:21:38 +0000 (13:21 +1100)
1  2 
drivers/tty/serial/omap-serial.c
fs/compat_ioctl.c

Simple merge
Simple merge