From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 17 Dec 2013 00:36:37 +0000 (-0800)
Subject: Merge 3.13-rc4 into tty-next
X-Git-Tag: v3.14-rc1~149^2~32
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6a8c62f3e97fdf184fde60bc99155476e8e9cd55;p=users%2Fjedix%2Flinux-maple.git

Merge 3.13-rc4 into tty-next

We want the fixes in here as well.
---

6a8c62f3e97fdf184fde60bc99155476e8e9cd55