1. 21 Apr, 2012 20 commits
  2. 20 Apr, 2012 14 commits
  3. 19 Apr, 2012 6 commits
    • Linus Torvalds's avatar
      Merge branch 'for-3.4' of git://linux-nfs.org/~bfields/linux · c6f5c930
      Linus Torvalds authored
      Pull nfsd bugfixes from J. Bruce Fields:
       "One bugfix, and one minor header fix from Jeff Layton while we're
        here"
      
      * 'for-3.4' of git://linux-nfs.org/~bfields/linux:
        nfsd: include cld.h in the headers_install target
        nfsd: don't fail unchecked creates of non-special files
      c6f5c930
    • Michael Krufky's avatar
      [media] xc5000: support 32MHz & 31.875MHz xtal using the 41.024.5 firmware · e631f578
      Michael Krufky authored
      Rather than loading firmware specific for the xtal frequency, just use
      the standard firmware and set the xtal frequency after firmware upload.
      
      The modified firmware will never be released, so we're better off
      merging this now rather than waiting for v3.5.
      Signed-off-by: default avatarMichael Krufky <mkrufky@kernellabs.com>
      Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
      e631f578
    • Konrad Rzeszutek Wilk's avatar
      xen/resume: Fix compile warnings. · 186bab1c
      Konrad Rzeszutek Wilk authored
      linux/drivers/xen/manage.c: In function 'do_suspend':
      linux/drivers/xen/manage.c:160:5: warning: 'si.cancelled' may be used uninitialized in this function
      Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
      186bab1c
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 19853301
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "It's like a grab bag of one liners:
      
        - core: fix page flip error path, reorder object teardown.
        - usb: fix the drm_usb module license.
        - i915: VT switch on SNB with non-native modes fix, and a regression
          fix from 3.3.
        - radeon: missing unreserve on SI, AGP/VRAM setup fix (fixes radeon on
          IA64, but its a generic bug), an rn50 regression from 3.3, turn off
          MSIs on rv515 (it loses rearms every so often)."
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        nouveau: Set special lane map for the right chipset
        drm/radeon: fix load detect on rn50 with hardcoded EDIDs.
        drm: Releasing FBs before releasing GEM objects during drm_release
        drm/nouveau/pm: don't read/write beyond end of stack buffer
        drivers: gpu: drm: gma500: mdfld_dsi_output.h: Remove not unneeded include of version.h
        radeon: fix r600/agp when vram is after AGP (v3)
        drm: fix page_flip error handling
        drm/radeon/kms: fix the regression of DVI connector check
        drm/usb: fix module license on drm/usb layer.
        drm/i915: Do not set "Enable Panel Fitter" on SNB pageflips
        drm/i915: Hold mode_config lock whilst changing mode for lastclose()
        drm/radeon/si: add missing radeon_bo_unreserve in si_rlc_init() v2
        drm/radeon: disable MSI on RV515
        drm/i915: don't clobber the special upscaling lvds timings
      19853301
    • Guennadi Liakhovetski's avatar
      [media] V4L: mt9m032: fix compilation breakage · 18311c53
      Guennadi Liakhovetski authored
      Fix the following compilation failure:
      
      linux-2.6/drivers/media/video/mt9m032.c: In function '__mt9m032_get_pad_crop':
      linux-2.6/drivers/media/video/mt9m032.c:337: error: implicit declaration of function 'v4l2_subdev_get_try_crop'
      linux-2.6/drivers/media/video/mt9m032.c:337: warning: return makes pointer from integer without a cast
      linux-2.6/drivers/media/video/mt9m032.c: In function '__mt9m032_get_pad_format':
      linux-2.6/drivers/media/video/mt9m032.c:359: error: implicit declaration of function 'v4l2_subdev_get_try_format'
      linux-2.6/drivers/media/video/mt9m032.c:359: warning: return makes pointer from integer without a cast
      linux-2.6/drivers/media/video/mt9m032.c: In function 'mt9m032_probe':
      linux-2.6/drivers/media/video/mt9m032.c:767: error: 'struct v4l2_subdev' has no member named 'entity'
      linux-2.6/drivers/media/video/mt9m032.c:826: error: 'struct v4l2_subdev' has no member named 'entity'
      linux-2.6/drivers/media/video/mt9m032.c: In function 'mt9m032_remove':
      linux-2.6/drivers/media/video/mt9m032.c:842: error: 'struct v4l2_subdev' has no member named 'entity'
      make[4]: *** [drivers/media/video/mt9m032.o] Error 1
      
      by adding a dependency on VIDEO_V4L2_SUBDEV_API.
      Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
      Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
      Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
      18311c53
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/virt/kvm/kvm · 9e01297e
      Linus Torvalds authored
      Pull KVM updates from Marcelo Tosatti.
      
      * git://git.kernel.org/pub/scm/virt/kvm/kvm:
        KVM: lock slots_lock around device assignment
        KVM: VMX: Fix kvm_set_shared_msr() called in preemptible context
        KVM: unmap pages from the iommu when slots are removed
        KVM: PMU emulation: GLOBAL_CTRL MSR should be enabled on reset
      9e01297e