From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 3 Apr 2013 23:01:14 +0000 (+1100)
Subject: Merge remote-tracking branch 'tty.current/tty-linus'
X-Git-Tag: next-20130404~122
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f25e9dc4e5aa751e68dd96705dc3246abee9ff4f;p=karo-tx-linux.git

Merge remote-tracking branch 'tty.current/tty-linus'
---

f25e9dc4e5aa751e68dd96705dc3246abee9ff4f