tree a55f50977c4f1c7d5f14beaeb8f4a71b8bcb7444
parent 8c9e80ed276fc4b9c9fadf29d8bf6b3576112f1a
parent 9db4e4381a8e881ff65a5d3400bfa471f84217e7
author Linus Torvalds <torvalds@linux-foundation.org> 1303514359 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1303514359 -0700

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