linux-next: manual merge of the v4l-dvb tree with Linus' tree

[Stephen Rothwell]

Hi Mauro,

Today's linux-next merge of the v4l-dvb tree got a conflict in
drivers/hid/hid-ids.h between commit 9ed326951806 ("HID: multitouch: Add
support for Baanto touchscreen") from Linus' tree and commit 110301833d6f
("[media] radio/si470x: Add support for the Axentia ALERT FM USB
Receiver") from the v4l-dvb tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/hid/hid-ids.h
index 6d3037e,70298d1..0000000
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@@ -160,9 -157,9 +160,12 @@@
  #define USB_VENDOR_ID_AVERMEDIA		0x07ca
  #define USB_DEVICE_ID_AVER_FM_MR800	0xb800
  
+ #define USB_VENDOR_ID_AXENTIA		0x12cf
+ #define USB_DEVICE_ID_AXENTIA_FM_RADIO	0x7111
+ 
 +#define USB_VENDOR_ID_BAANTO		0x2453
 +#define USB_DEVICE_ID_BAANTO_MT_190W2	0x0100
 +
  #define USB_VENDOR_ID_BELKIN		0x050d
  #define USB_DEVICE_ID_FLIP_KVM		0x3201

Attachment: pgp00000.pgp
Description: PGP signature