From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Sun, 7 Oct 2012 23:35:29 +0000 (+1100)
Subject: Merge remote-tracking branch 'hid/for-next'
X-Git-Tag: next-20121008~60
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fb35433240593d18d4468dd04c42b156db12b821;p=karo-tx-linux.git

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

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

fb35433240593d18d4468dd04c42b156db12b821