From: Mark Brown <broonie@linaro.org>
Date: Tue, 31 Dec 2013 12:59:55 +0000 (+0000)
Subject: Merge tag 'v3.13-rc6' into spi-dw
X-Git-Tag: firefly_0821_release~176^2~4567^2~4^10~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=68066bb378a0504439e046cdb55d88362eb6379d;p=firefly-linux-kernel-4.4.55.git

Merge tag 'v3.13-rc6' into spi-dw

To resolve trivial overlaps with fixes.

Linux 3.13-rc6
---

68066bb378a0504439e046cdb55d88362eb6379d