From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 17 Nov 2012 02:24:22 +0000 (-0800)
Subject: Merge 3.7-rc6 into staging-next
X-Git-Tag: v3.8-rc1~178^2~295
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=acf1cf6a1c0966ef64a73083ca985605a12b032d;p=linux.git

Merge 3.7-rc6 into staging-next
---

acf1cf6a1c0966ef64a73083ca985605a12b032d