From: Jiri Kosina <jkosina@suse.cz>
Date: Fri, 12 Dec 2014 10:09:23 +0000 (+0100)
Subject: Merge branches 'for-3.18/upstream-fixes' and 'for-3.19/upstream' into for-linus
X-Git-Tag: omap-for-v3.19/fixes-rc1~112^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ee420ba2e7fa074a668e30c2d0f4abd317e4927;p=pandora-kernel.git

Merge branches 'for-3.18/upstream-fixes' and 'for-3.19/upstream' into for-linus

Conflicts:
	drivers/hid/hid-input.c
---

3ee420ba2e7fa074a668e30c2d0f4abd317e4927
Reading git-diff-tree failed