1. 26 Jul, 2012 8 commits
  2. 09 Jul, 2012 1 commit
  3. 27 Jun, 2012 4 commits
  4. 26 Jun, 2012 3 commits
  5. 25 Jun, 2012 8 commits
    • Linus Torvalds's avatar
      Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · aace99e5
      Linus Torvalds authored
      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
    • Linus Torvalds's avatar
      Merge tag 'regulator-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator · bbcaf411
      Linus Torvalds authored
      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
    • Linus Torvalds's avatar
      Merge branch 'fixes-for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping · 5c0a981f
      Linus Torvalds authored
      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
    • Paul Mundt's avatar
      bug.h: Fix up CONFIG_BUG=n implicit function declarations. · 09682c1d
      Paul Mundt authored
      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: default avatarFengguang Wu <fengguang.wu@intel.com>
      Tested-by: default avatarFengguang Wu <wfg@linux.intel.com>
      Acked-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
      Cc: Arnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      09682c1d
    • Henrik Rydberg's avatar
      HID: Fix the generic Kconfig options · 1f41a6a9
      Henrik Rydberg authored
      The generic HID driver is obviously not a special driver, so move it
      outside of the special drivers menu. Explain the usage and make the
      default follow the HID setting. This should simplify migration from
      older kernels. While at it, remove the redundant HID_SUPPORT option
      and modify the HID and USB_HID entries to better explain the bus
      structure.
      Reported-by: default avatarJan Beulich <jbeulich@suse.com>
      Signed-off-by: default avatarHenrik Rydberg <rydberg@euromail.se>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      1f41a6a9
    • Yufeng Shen's avatar
      HID: magicmouse: Correct report range of major / minor axes · e75561b3
      Yufeng Shen authored
      In patch "HID: magicmouse: Adjust major / minor axes to scale",
      touch_major and touch_minor axes are scaled by a factor of
      four when reported but the max touch_major/minor is not scaled
      accordingly. This patch scales the max touch_major/minor to
      be consistent with the reported value.
      Signed-off-by: default avatarYufeng Shen <miletus@chromium.org>
      Acked-by: default avatarHenrik Rydberg <rydberg@euromail.se>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      e75561b3
    • Marek Szyprowski's avatar
      ARM: dma-mapping: fix buffer chunk allocation order · 593f4735
      Marek Szyprowski authored
      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: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
      593f4735
    • Dave Airlie's avatar
      drm/udl: Make sure to get correct endian keys from vendor descriptor · d42f0349
      Dave Airlie authored
      This is a port of
      commit b49f184b
      Author: Ben Collins <bcollins@ubuntu.com>
      from udlfb to udl kms driver.
      
      The driver was not using le16_to_cpu when reading keys from the vendor
      descriptor, causing incorrect parsing. Mainly, sku_pixel_limit was not
      being parsed on big-endian systems. This would result in a blank screen
      on big-endian CPUs where the DL chips's max mode was smaller than the
      monitor's native mode.
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      d42f0349
  6. 24 Jun, 2012 7 commits
  7. 23 Jun, 2012 7 commits
  8. 22 Jun, 2012 2 commits
    • Linus Torvalds's avatar
      Merge tag 'for-linus-Jun-21-2012' of git://oss.sgi.com/xfs/xfs · 369c4f54
      Linus Torvalds authored
      Pull XFS fixes from Ben Myers:
       - Fix stale data exposure with unwritten extents
       - Fix a warning in xfs_alloc_vextent with ODEBUG
       - Fix overallocation and alignment of pages for xfs_bufs
       - Fix a cursor leak
       - Fix a log hang
       - Fix a crash related to xfs_sync_worker
       - Rename xfs log structure from struct log to struct xlog so we can use
         crash dumps effectively
      
      * tag 'for-linus-Jun-21-2012' of git://oss.sgi.com/xfs/xfs:
        xfs: rename log structure to xlog
        xfs: shutdown xfs_sync_worker before the log
        xfs: Fix overallocation in xfs_buf_allocate_memory()
        xfs: fix allocbt cursor leak in xfs_alloc_ag_vextent_near
        xfs: check for stale inode before acquiring iflock on push
        xfs: fix debug_object WARN at xfs_alloc_vextent()
        xfs: xfs_vm_writepage clear iomap_valid when !buffer_uptodate (REV2)
      369c4f54
    • Linus Torvalds's avatar
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · a1163719
      Linus Torvalds authored
      Pull perf updates from Ingo Molnar.
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        ftrace: Make all inline tags also include notrace
        perf: Use css_tryget() to avoid propping up css refcount
        perf tools: Fix synthesizing tracepoint names from the perf.data headers
        perf stat: Fix default output file
        perf tools: Fix endianity swapping for adds_features bitmask
      a1163719