Merge 3.7-rc6 into tty-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 17 Nov 2012 02:26:00 +0000 (18:26 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 17 Nov 2012 02:26:00 +0000 (18:26 -0800)
commit1e619a1bf9ac878e6a984e4e279ccf712a65bc23
tree1d5cfb16f88e36dca2f57386dd4a585a63f15287
parent68a81291ff6650f3ff409ebfc58ef97dfe85a2e4
parentf4a75d2eb7b1e2206094b901be09adb31ba63681
Merge 3.7-rc6 into tty-next
drivers/s390/char/con3215.c