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

Conflicts:
	drivers/staging/media/as102/as102_drv.h

diff --cc drivers/staging/media/as102/as102_drv.c
Simple merge

diff --cc drivers/staging/media/as102/as102_drv.h
index fd33f5a12dcc2167cf9dada508b13521f7159b8f,0ecef9e1a6961ad31acc90f39eda8957aefb9a81..957f0ed0d81aae7c8d587dbca4b853cf862b3814
--- 1/drivers/staging/media/as102/as102_drv.h
--- 2/drivers/staging/media/as102/as102_drv.h
+++ b/drivers/staging/media/as102/as102_drv.h
@@@ -37,8 -27,9 +27,10 @@@
  #define DRIVER_FULL_NAME "Abilis Systems as10x usb driver"
  #define DRIVER_NAME "as10x_usb"
  
 -extern int debug;
 +extern int as102_debug;
 +#define debug as102_debug
+ extern struct usb_driver as102_usb_driver;
+ extern int elna_enable;
  
  #define dprintk(debug, args...) \
        do { if (debug) {       \