From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Thu, 24 Jul 2014 19:36:56 +0000 (-0700)
Subject: Merge tag 'v3.16-rc6' into next
X-Git-Tag: firefly_0821_release~176^2~541^2~171^2~33
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b9f12a5d97f652c77ef6803dccd0d40d1290f5be;p=firefly-linux-kernel-4.4.55.git

Merge tag 'v3.16-rc6' into next

Merge with mainline to bring in changes to MFD to allow merging
ipaq-micro-ts driver.
---

b9f12a5d97f652c77ef6803dccd0d40d1290f5be