summaryrefslogtreecommitdiff
path: root/arch/arm/mach-pxa/pm.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-07-27 12:52:03 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-07-27 12:52:03 -0700
commitc1e7179a38919f02dd950801529176b72f5e5a8a (patch)
tree70b014e6f48768d38b984de3a3fc1cd53201933d /arch/arm/mach-pxa/pm.c
parent84eda28060f7e7d5f91f81f928532af13b9e44b2 (diff)
parent38bd2a1ac736901d1cf4971c78ef952ba92ef78b (diff)
Merge tag 'tty-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull TTY/Serial patches from Greg Kroah-Hartman: "Here's the "tiny" set of patches for 3.6-rc1 for the tty layer and serial drivers. They were cherry-picked from the tty-next branch of the tty git tree, as they are small and "obvious" fixes. The larger changes, as mentioned before, will be saved for the 3.7-rc1 merge window. All of these changes have been in the linux-next releases for quite a while. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>" * tag 'tty-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: pch_uart: Fix parity setting issue pch_uart: Fix rx error interrupt setting issue pch_uart: Fix missing break for 16 byte fifo tty ldisc: Close/Reopen race prevention should check the proper flag pch_uart: Add eg20t_port lock field, avoid recursive spinlocks vt: fix race in vt_waitactive() serial/of-serial: Add LPC3220 standard UART compatible string serial/8250: Add LPC3220 standard UART type serial_core: Update buffer overrun statistics. serial: samsung: Fixed wrong comparison for baudclk_rate
Diffstat (limited to 'arch/arm/mach-pxa/pm.c')
0 files changed, 0 insertions, 0 deletions