Merge remote-tracking branch 'v4l-dvb/master'

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

Mon, 6 Jan 2014 01:41:02 +0000 (12:41 +1100)

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

Mon, 6 Jan 2014 01:41:02 +0000 (12:41 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 6 Jan 2014 01:41:02 +0000 (12:41 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 6 Jan 2014 01:41:02 +0000 (12:41 +1100)
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>
	Mon, 6 Jan 2014 01:41:02 +0000 (12:41 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 6 Jan 2014 01:41:02 +0000 (12:41 +1100)
		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