summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-04-22 16:19:19 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-04-22 16:19:19 -0700
commit0f1d9f78ce41a8874d30271ef8480e6f8f7f1fce (patch)
treea55f50977c4f1c7d5f14beaeb8f4a71b8bcb7444 /fs
parent8c9e80ed276fc4b9c9fadf29d8bf6b3576112f1a (diff)
parent9db4e4381a8e881ff65a5d3400bfa471f84217e7 (diff)
Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
* 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: tty/n_gsm: fix bug in CRC calculation for gsm1 mode serial/imx: read cts state only after acking cts change irq parport_pc.c: correctly release the requested region for the IT887x
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions