From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 24 Jun 2013 22:14:43 +0000 (-0700)
Subject: Merge 3.10-rc7 into driver-core-next
X-Git-Tag: firefly_0821_release~176^2~5843^2~3
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b5aef682e00c424bb2f55639168083b61803a012;p=firefly-linux-kernel-4.4.55.git

Merge 3.10-rc7 into driver-core-next

We want the firmware merge fixes, and other bits, in here now.

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

b5aef682e00c424bb2f55639168083b61803a012