leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
47921932f3
linux/drivers/media/video/omap
History
Mauro Carvalho Chehab b4d48c942c 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
2011-12-30 13:59:37 -02:00
..
Kconfig [media] OMAP_VOUT: Create separate file for VRFB related API's 2011-07-27 17:56:06 -03:00
Makefile [media] OMAP_VOUT: Create separate file for VRFB related API's 2011-07-27 17:56:06 -03:00
omap_vout_vrfb.c [media] OMAP_VOUT: Create separate file for VRFB related API's 2011-07-27 17:56:06 -03:00
omap_vout_vrfb.h [media] OMAP_VOUT: Create separate file for VRFB related API's 2011-07-27 17:56:06 -03:00
omap_vout.c Merge tag 'v3.2-rc7' into staging/for_v3.3 2011-12-30 13:59:37 -02:00
omap_voutdef.h [media] OMAP_VOUT: Increase MAX_DISPLAYS to a larger value 2011-11-07 11:21:58 -02:00
omap_voutlib.c [media] OMAP_VOUT: CLEANUP: Move generic functions and macros to common files 2011-07-27 17:56:05 -03:00
omap_voutlib.h [media] OMAP_VOUT: CLEANUP: Move generic functions and macros to common files 2011-07-27 17:56:05 -03:00