projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 66f75a5 5f1a389)
Merge 3.4-rc4 into tty-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 23 Apr 2012 16:39:23 +0000 (09:39 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 23 Apr 2012 16:39:23 +0000 (09:39 -0700)
commit10af77c193681398e5dbe830db181d86047fcd41
treeb843eb8dae09a53efb410dd11d2132dba4fe4d15tree | snapshot
parent66f75a5d028beaf67c931435fdc3e7823125730ccommit | diff
parent5f1a38952b7e932a1c169c28917b9a831f641bcccommit | diff
Merge 3.4-rc4 into tty-next

This resolves the merge problem with:
drivers/tty/serial/pch_uart.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/arm/mach-omap2/serial.c diff1 | diff2 | blob | history
drivers/tty/serial/pch_uart.c diff1 | diff2 | blob | history
ep93xx device tree rework repo: git://git.maquefel.me/linux.git