From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 14 Nov 2012 20:30:12 +0000 (-0800)
Subject: Merge v3.7-rc5 into tty-next
X-Git-Tag: v3.8-rc1~177^2~75
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=54d5f88f25c38e5500a17b16240cb3775af00876;p=users%2Fjedix%2Flinux-maple.git

Merge v3.7-rc5 into tty-next

This pulls in the 3.7-rc5 fixes into tty-next to make it easier to test.
---

54d5f88f25c38e5500a17b16240cb3775af00876