From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Wed, 14 May 2014 23:49:19 +0000 (-0700)
Subject: Merge tag 'v3.15-rc5' into next
X-Git-Tag: firefly_0821_release~176^2~541^2~180^2~52
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=879f99ef2c4c05d9a7f0a67a05f1415663119825;p=firefly-linux-kernel-4.4.55.git

Merge tag 'v3.15-rc5' into next

Merge with Linux 3.15-rc5 to sync up Wacom and other changes.
---

879f99ef2c4c05d9a7f0a67a05f1415663119825