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

author Stephen Rothwell <sfr@canb.auug.org.au>

Fri, 24 Aug 2012 00:55:40 +0000 (10:55 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Fri, 24 Aug 2012 00:55:40 +0000 (10:55 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 24 Aug 2012 00:55:40 +0000 (10:55 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 24 Aug 2012 00:55:40 +0000 (10:55 +1000)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/hid/hid-core.c
Simple merge
diff --cc drivers/hid/hid-ids.h
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 24 Aug 2012 00:55:40 +0000 (10:55 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 24 Aug 2012 00:55:40 +0000 (10:55 +1000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-core.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-ids.h	patch \|	diff1 \|	diff2 \|	blob \| history