Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 26 Jul 2010 20:06:25 +0000 (13:06 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 26 Jul 2010 20:06:25 +0000 (13:06 -0700)
commit4afb93b4211b3f65ebd8ea0d9018426dd9e8693e
treeff1ed561413f38b818514559f7efb223189640f1
parent225aa01173b271a3802b716e14176eb7d11dcce4
parentf7512e7c4bb557b784fd5326f78983a7dea9949c
Merge git://git./linux/kernel/git/gregkh/tty-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
  serial: fix rs485 for atmel_serial on avr32