summaryrefslogtreecommitdiff
path: root/arch/m68k/include/uapi/asm/poll.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-10-26 21:26:08 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-26 21:26:08 +0400
commit6ad2c73d11d32994b7e9a605ee93e97b13c41f78 (patch)
treee2aa9f9eb9eda9e5e16d434a5a138fa38fc8abb0 /arch/m68k/include/uapi/asm/poll.h
parent490916d6baaa797d406f659996ffce49679b61e8 (diff)
parenta4f743851f74fc3e0cc40c13082e65c24139f481 (diff)
downloadlinux-6ad2c73d11d32994b7e9a605ee93e97b13c41f78.tar.xz
Merge tag 'tty-3.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull serial fix from Greg Kroah-Hartman: "Here is one patch, a revert of a omap serial driver patch that was causing problems, for your 3.7-rc tree. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>" * tag 'tty-3.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: Revert "serial: omap: fix software flow control"
Diffstat (limited to 'arch/m68k/include/uapi/asm/poll.h')
0 files changed, 0 insertions, 0 deletions