1. 27 6月, 2012 7 次提交
  2. 26 6月, 2012 4 次提交
    • L
      Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · aace99e5
      Linus Torvalds 提交于
      Pull media fixes from Mauro Carvalho Chehab.
      
      Trivial conflict due to new USB HID ID's being added next to each other
      (Baanto vs Axentia).
      
      * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (44 commits)
        [media] smia: Fix compile failures
        [media]  Fix VIDIOC_DQEVENT docbook entry
        [media] s5p-fimc: Fix control creation function
        [media] s5p-mfc: Fix checkpatch error in s5p_mfc_shm.h file
        [media] s5p-mfc: Fix setting controls
        [media] v4l/s5p-mfc: added image size align in VIDIOC_TRY_FMT
        [media] v4l/s5p-mfc: corrected encoder v4l control definitions
        [media] v4l: mem2mem_testdev: Fix race conditions in driver
        [media] s5p-mfc: Bug fix of timestamp/timecode copy mechanism
        [media] cxd2820r: Fix an incorrect modulation type bitmask
        [media] em28xx: Show a warning if the board does not support remote controls
        [media] em28xx: Add remote control support for Terratec's Cinergy HTC Stick HD
        [media] USB: Staging: media: lirc: initialize spinlocks before usage
        [media] Revert "[media] media: mx2_camera: Fix mbus format handling"
        [media] bw-qcam: driver and pixfmt documentation fixes
        [media] cx88: fix firmware load on big-endian systems
        [media] cx18: support big-endian systems
        [media] ivtv: fix support for big-endian systems
        [media] tuner-core: return the frequency range of the correct tuner
        [media] v4l2-dev.c: fix g_parm regression in determine_valid_ioctls()
        ...
      aace99e5
    • L
      Merge tag 'regulator-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator · bbcaf411
      Linus Torvalds 提交于
      Pull regulator fixes from Mark Brown:
       "A few small, driver specific bug fixes, nothing exciting here but all
        needed if you happen to be using the affected hardware."
      
      * tag 'regulator-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
        regulator: palmas: fix regmap offsets for enable/disable
        regulator: tps6524x: Fix get_voltage_sel for fixed voltage
        regulator: tps65023: Fix mask for LDOs output voltage select control
      bbcaf411
    • L
      Merge branch 'fixes-for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping · 5c0a981f
      Linus Torvalds 提交于
      Git pull DMA-mapping fix from Marek Szyprowski:
       "Another minor fixup for ARM dma-mapping redesign and extensions merged
        in this merge window"
      
      * 'fixes-for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
        ARM: dma-mapping: fix buffer chunk allocation order
      5c0a981f
    • P
      bug.h: Fix up CONFIG_BUG=n implicit function declarations. · 09682c1d
      Paul Mundt 提交于
      Commit 2603efa3 ("bug.h: Fix up powerpc build regression") corrected
      the powerpc build case and extended the __ASSEMBLY__ guards, but it also
      got caught in pre-processor hell accidentally matching the else case of
      CONFIG_BUG resulting in the BUG disabled case tripping up on
      -Werror=implicit-function-declaration.
      
      It's not possible to __ASSEMBLY__ guard the entire file as architecture
      code needs to get at the BUGFLAG_WARNING definition in the GENERIC_BUG
      case, but the rest of the CONFIG_BUG=y/n case needs to be guarded.
      
      Rather than littering endless __ASSEMBLY__ checks in each of the if/else
      cases we just move the BUGFLAG definitions up under their own
      GENERIC_BUG test and then shove everything else under one big
      __ASSEMBLY__ guard.
      
      Build tested on all of x86 CONFIG_BUG=y, CONFIG_BUG=n, powerpc (due to
      it's dependence on BUGFLAG definitions in assembly code), and sh (due to
      not bringing in linux/kernel.h to satisfy the taint flag definitions used
      by the generic bug code).
      
      Hopefully that's the end of the corner cases and I can abstain from ever
      having to touch this infernal header ever again.
      Reported-by: NFengguang Wu <fengguang.wu@intel.com>
      Tested-by: NFengguang Wu <wfg@linux.intel.com>
      Acked-by: NRandy Dunlap <rdunlap@xenotime.net>
      Cc: Arnd Bergmann <arnd@arndb.de>
      Signed-off-by: NPaul Mundt <lethal@linux-sh.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      09682c1d
  3. 25 6月, 2012 7 次提交
    • M
      ARM: dma-mapping: fix buffer chunk allocation order · 593f4735
      Marek Szyprowski 提交于
      IOMMU-aware dma_alloc_attrs() implementation allocates buffers in
      power-of-two chunks to improve performance and take advantage of large
      page mappings provided by some IOMMU hardware. However current code, due
      to a subtle bug, allocated those chunks in the smallest-to-largest
      order, what completely killed all the advantages of using larger than
      page chunks. If a 4KiB chunk has been mapped as a first chunk, the
      consecutive chunks are not aligned correctly to the power-of-two which
      match their size and IOMMU drivers were not able to use internal
      mappings of size other than the 4KiB (largest common denominator of
      alignment and chunk size).
      
      This patch fixes this issue by changing to the correct largest-to-smallest
      chunk size allocation sequence.
      Signed-off-by: NMarek Szyprowski <m.szyprowski@samsung.com>
      593f4735
    • L
      Linux 3.5-rc4 · 6b16351a
      Linus Torvalds 提交于
      6b16351a
    • A
      Fix typo in printed messages · 02b7d834
      Anatol Pomozov 提交于
      Coult -> Could
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      02b7d834
    • L
      Merge git://git.kernel.org/pub/scm/virt/kvm/kvm · 104452f0
      Linus Torvalds 提交于
      Pull KVM fixes from Avi Kivity:
       "Fixing a scheduling-while-atomic bug in the ppc code, and a bug which
        allowed pci bridges to be assigned to guests."
      
      * git://git.kernel.org/pub/scm/virt/kvm/kvm:
        KVM: PPC: Book3S HV: Drop locks around call to kvmppc_pin_guest_page
        KVM: Fix PCI header check on device assignment
      104452f0
    • L
      Merge tag 'rdma-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · 08d49c46
      Linus Torvalds 提交于
      Pull InfiniBand/RDMA fixes from Roland Dreier:
       - Fixes to new ocrdma driver
       - Typo in test in CMA
      
      * tag 'rdma-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
        RDMA/cma: QP type check on received REQs should be AND not OR
        RDMA/ocrdma: Fix off by one in ocrdma_query_gid()
        RDMA/ocrdma: Fixed RQ error CQE polling
        RDMA/ocrdma: Correct queue SGE calculation
        RDMA/ocrdma: Correct reported max queue sizes
        RDMA/ocrdma: Fixed GID table for vlan and events
      08d49c46
    • L
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · a4a20fd9
      Linus Torvalds 提交于
      Pull ARM SoC fixes from Olof Johansson:
       "Nothing very controversial in here.  Most of the fixes are for OMAP
        this time around, with some orion/kirkwood and a tegra patch mixed in."
      
      * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: Orion: Fix Virtual/Physical mixup with watchdog
        ARM: Kirkwood: clk_register_gate_fn: add fn assignment
        ARM: Orion5x - Restore parts of io.h, with rework
        ARM: OMAP4: hwmod data: Force HDMI in no-idle while enabled
        ARM: OMAP2+: mux: fix sparse warning
        ARM: OMAP2+: CM: increase the module disable timeout
        ARM: OMAP4: clock data: add clockdomains for clocks used as main clocks
        ARM: OMAP4: hwmod data: fix 32k sync timer idle modes
        ARM: OMAP4+: hwmod: fix issue causing IPs not going back to Smart-Standby
        ARM: OMAP: Fix Beagleboard DVI reset gpio
        arm/dts: OMAP2: Fix interrupt controller binding
        ARM: OMAP2: Fix tusb6010 GPIO interrupt for n8x0
        ARM: OMAP2+: Fix MUSB ifdefs for platform init code
        ARM: tegra: make tegra_cpu_reset_handler_enable() __init
        ARM: OMAP: PM: Lock clocks list while generating summary
        ARM: iconnect: Remove include of removed linux/spi/orion_spi.h
      a4a20fd9
    • L
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 2ecedc47
      Linus Torvalds 提交于
      Pull drm fixes from Dave Airlie:
       "Nothing major in here, one radeon SI fix for tiling, and one uninit
        var fix, two minor header file fixes."
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm: drop comment about this header being autogenerated.
        drm/edid: don't return stack garbage from supports_rb
        vga_switcheroo: Add include guard
        drm/radeon: SI tiling fixes for display
      2ecedc47
  4. 24 6月, 2012 6 次提交
  5. 23 6月, 2012 4 次提交
  6. 22 6月, 2012 12 次提交