From: Jiri Kosina <jkosina@suse.cz>
Date: Wed, 4 Jun 2014 11:09:01 +0000 (+0200)
Subject: Merge branches 'for-3.15/upstream-fixes' and 'for-3.16/upstream' into for-linus
X-Git-Tag: omap-for-v3.16/fixes-against-rc1~39^2~6^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af5666e0f76023d9c296016024297903a4c83108;p=pandora-kernel.git

Merge branches 'for-3.15/upstream-fixes' and 'for-3.16/upstream' into for-linus

Conflicts:
	drivers/hid/hid-sensor-hub.c
---

af5666e0f76023d9c296016024297903a4c83108
Reading git-diff-tree failed