1. 27 Aug, 2011 15 commits
  2. 07 Aug, 2011 2 commits
  3. 06 Aug, 2011 9 commits
  4. 31 Jul, 2011 11 commits
  5. 30 Jul, 2011 3 commits
    • Linus Torvalds's avatar
      Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 · 664a41b8
      Linus Torvalds authored
      * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (430 commits)
        [media] ir-mce_kbd-decoder: include module.h for its facilities
        [media] ov5642: include module.h for its facilities
        [media] em28xx: Fix DVB-C maxsize for em2884
        [media] tda18271c2dd: Fix saw filter configuration for DVB-C @6MHz
        [media] v4l: mt9v032: Fix Bayer pattern
        [media] V4L: mt9m111: rewrite set_pixfmt
        [media] V4L: mt9m111: fix missing return value check mt9m111_reg_clear
        [media] V4L: initial driver for ov5642 CMOS sensor
        [media] V4L: sh_mobile_ceu_camera: fix Oops when USERPTR mapping fails
        [media] V4L: soc-camera: remove soc-camera bus and devices on it
        [media] V4L: soc-camera: un-export the soc-camera bus
        [media] V4L: sh_mobile_csi2: switch away from using the soc-camera bus notifier
        [media] V4L: add media bus configuration subdev operations
        [media] V4L: soc-camera: group struct field initialisations together
        [media] V4L: soc-camera: remove now unused soc-camera specific PM hooks
        [media] V4L: pxa-camera: switch to using standard PM hooks
        [media] NetUP Dual DVB-T/C CI RF: force card hardware revision by module param
        [media] Don't OOPS if videobuf_dvb_get_frontend return NULL
        [media] NetUP Dual DVB-T/C CI RF: load firmware according card revision
        [media] omap3isp: Support configurable HS/VS polarities
        ...
      
      Fix up conflicts:
       - arch/arm/mach-omap2/board-rx51-peripherals.c:
           cleanup regulator supply definitions in mach-omap2
         vs
           OMAP3: RX-51: define vdds_csib regulator supply
       - drivers/staging/tm6000/tm6000-alsa.c (trivial)
      664a41b8
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs · 983236b5
      Linus Torvalds authored
      * 'for-linus' of git://oss.sgi.com/xfs/xfs:
        xfs: Fix build breakage in xfs_iops.c when CONFIG_FS_POSIX_ACL is not set
      983236b5
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6 · 74aec4e0
      Linus Torvalds authored
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6:
        ecryptfs: Make inode bdi consistent with superblock bdi
        eCryptfs: Unlock keys needed by ecryptfsd
      74aec4e0