From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 17 Nov 2012 02:26:00 +0000 (-0800)
Subject: Merge 3.7-rc6 into tty-next
X-Git-Tag: v3.8-rc1~177^2~39
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=1e619a1bf9ac878e6a984e4e279ccf712a65bc23;p=linux.git

Merge 3.7-rc6 into tty-next
---

1e619a1bf9ac878e6a984e4e279ccf712a65bc23