]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'v3.2-rc7' into staging/for_v3.3
authorMauro Carvalho Chehab <mchehab@redhat.com>
Fri, 30 Dec 2011 15:59:37 +0000 (13:59 -0200)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Fri, 30 Dec 2011 15:59:37 +0000 (13:59 -0200)
commiteb0a91b77276f20cdf487932d9757bf57a619757
tree3365292f3a5a502edb51492d011fd326c930ca40
parent631adcb71109943c313ea9f14150a50931512ae9
parentb9c3854b89b5803ce4d52fd0c066735e6b6ea8d9
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
MAINTAINERS
drivers/media/common/tuners/mxl5007t.c
drivers/media/common/tuners/tda18218.c
drivers/media/video/mt9m111.c
drivers/media/video/omap/omap_vout.c
drivers/media/video/omap3isp/ispvideo.c
drivers/staging/media/as102/as102_drv.c
drivers/staging/media/as102/as102_drv.h