Merge tag 'v3.2-rc7' into staging/for_v3.3

Linux 3.2-rc7

* tag 'v3.2-rc7': (1304 commits)
  Linux 3.2-rc7
  netfilter: xt_connbytes: handle negation correctly
  Btrfs: call d_instantiate after all ops are setup
  Btrfs: fix worker lock misuse in find_worker
  net: relax rcvbuf limits
  rps: fix insufficient bounds checking in store_rps_dev_flow_table_cnt()
  net: introduce DST_NOPEER dst flag
  mqprio: Avoid panic if no options are provided
  bridge: provide a mtu() method for fake_dst_ops
  md/bitmap: It is OK to clear bits during recovery.
  md: don't give up looking for spares on first failure-to-add
  md/raid5: ensure correct assessment of drives during degraded reshape.
  md/linear: fix hot-add of devices to linear arrays.
  sparc64: Fix MSIQ HV call ordering in pci_sun4v_msiq_build_irq().
  pata_of_platform: Add missing CONFIG_OF_IRQ dependency.
  ipv4: using prefetch requires including prefetch.h
  VFS: Fix race between CPU hotplug and lglocks
  vfs: __read_cache_page should use gfp argument rather than GFP_KERNEL
  USB: Fix usb/isp1760 build on sparc
  net: Add a flow_cache_flush_deferred function
  ...

Conflicts:
	drivers/media/common/tuners/tda18218.c
	drivers/media/video/omap3isp/ispccdc.c
	drivers/staging/media/as102/as102_drv.h

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/media/common/tuners/mxl5007t.c
Simple merge

diff --cc drivers/media/common/tuners/tda18218.c
index 1c865950ddf49697a9bd5e1c69dc9782ab8217da,4fc29730a12ccf2305739c34efa625deef0a1f95..d099501566a105cf297ada07f9b144920166f751
--- 1/drivers/media/common/tuners/tda18218.c
--- 2/drivers/media/common/tuners/tda18218.c
+++ b/drivers/media/common/tuners/tda18218.c
@@@ -141,7 -141,7 +141,7 @@@ static int tda18218_set_params(struct d
        switch (params->u.ofdm.bandwidth) {
        case BANDWIDTH_6_MHZ:
                LP_Fc = 0;
-               priv->if_frequency = 4000000;
 -              LO_Frac = params->frequency + 3000000;
++              priv->if_frequency = 3000000;
                break;
        case BANDWIDTH_7_MHZ:
                LP_Fc = 1;

diff --cc drivers/media/video/mt9m111.c
Simple merge

diff --cc drivers/media/video/omap/omap_vout.c
Simple merge

diff --cc drivers/media/video/omap3isp/ispvideo.c
Simple merge

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

diff --cc drivers/staging/media/as102/as102_drv.h
index 0ecef9e1a6961ad31acc90f39eda8957aefb9a81,fd33f5a12dcc2167cf9dada508b13521f7159b8f..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
@@@ -27,9 -37,8 +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) {       \