From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 3 Oct 2012 01:47:51 +0000 (+1000)
Subject: Merge remote-tracking branch 'hid/for-next'
X-Git-Tag: next-20121003~70
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a717dceb248c067db4da72a7dc5b8a2b6a8beb41;p=karo-tx-linux.git

Merge remote-tracking branch 'hid/for-next'

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

a717dceb248c067db4da72a7dc5b8a2b6a8beb41