From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 17 Nov 2012 02:21:36 +0000 (-0800)
Subject: Merge 3.7-rc6 into char-misc-next
X-Git-Tag: v3.8-rc1~179^2~42
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=98c4514ff6e3072288770db66f91bdb15af8b433;p=linux.git

Merge 3.7-rc6 into char-misc-next
---

98c4514ff6e3072288770db66f91bdb15af8b433