From: Jiri Kosina <jkosina@suse.cz>
Date: Thu, 21 Feb 2013 09:45:52 +0000 (+0100)
Subject: Merge branches 'for-3.9/sony' and 'for-3.9/steelseries' into for-linus
X-Git-Tag: v3.9-rc1~112^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d69a3c731e120b05b7da9fb976830475a3fbc01;p=pandora-kernel.git

Merge branches 'for-3.9/sony' and 'for-3.9/steelseries' into for-linus

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

0d69a3c731e120b05b7da9fb976830475a3fbc01
Reading git-diff-tree failed