From: Jiri Kosina <jkosina@suse.cz>
Date: Tue, 1 Apr 2014 17:06:41 +0000 (+0200)
Subject: Merge branch 'for-3.15/microsoft' into for-linus
X-Git-Tag: v3.15-rc1~114^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6cf8c85f8bc320ca0273c5261cc13ee1491d7b92;p=pandora-kernel.git

Merge branch 'for-3.15/microsoft' into for-linus

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

6cf8c85f8bc320ca0273c5261cc13ee1491d7b92
Reading git-diff-tree failed