From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Tue, 7 Apr 2015 15:46:23 +0000 (-0700)
Subject: Merge tag 'v4.0-rc7' into next
X-Git-Tag: omap-for-v4.1/fixes-rc1~145^2^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f63e885ac32429fc1340f5a61e1484022efc773;p=pandora-kernel.git

Merge tag 'v4.0-rc7' into next

Sync up with Linux 4.0-rc7 to bring in ALPS changes.
---

5f63e885ac32429fc1340f5a61e1484022efc773
Reading git-diff-tree failed