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

Merge branch 'for-3.15/hid-core-ll-transport-cleanup' into for-linus

Conflicts:
	drivers/hid/hid-ids.h
	drivers/hid/hid-sony.c
	drivers/hid/i2c-hid/i2c-hid.c
---

ad295b6d5739ab24880a31be403bbc8fab62e177
Reading git-diff-tree failed