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: firefly_0821_release~3680^2~1519^2~295
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=acf1cf6a1c0966ef64a73083ca985605a12b032d;p=firefly-linux-kernel-4.4.55.git

Merge 3.7-rc6 into staging-next
---

acf1cf6a1c0966ef64a73083ca985605a12b032d