From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 29 Oct 2012 15:44:40 +0000 (-0700)
Subject: Merge 3.7-rc3 into char-misc-next
X-Git-Tag: v3.8-rc1~179^2~70
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e64de3b96c1ba3c1de236a4a103ec21234a5849f;p=users%2Fjedix%2Flinux-maple.git

Merge 3.7-rc3 into char-misc-next

This brings in the various 3.7-rc3 char fixes into char-misc-next.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

e64de3b96c1ba3c1de236a4a103ec21234a5849f