1. 27 Jul, 2011 15 commits
    • Linus Torvalds's avatar
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes · 333c066b
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:
        GFS2: Fix mount hang caused by certain access pattern to sysfs files
      333c066b
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · 75623437
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (22 commits)
        ALSA: hda - Cirrus Logic CS421x support
        ALSA: Make pcm.h self-contained
        ALSA: hda - Allow codec-specific set_power_state ops
        ALSA: hda - Add post_suspend patch ops
        ALSA: hda - Make CONFIG_SND_HDA_POWER_SAVE depending on CONFIG_PM
        ALSA: hda - Make sure mute led reflects master mute state
        ALSA: hda - Fix invalid mute led state on resume of IDT codecs
        ASoC: Revert "ASoC: SAMSUNG: Add I2S0 internal dma driver"
        ALSA: hda - Add support of the 4 internal speakers on certain HP laptops
        ALSA: Make snd_pcm_debug_name usable outside pcm_lib
        ALSA: hda - Fix DAC filling for multi-connection pins in Realtek parser
        ASoC: dapm - Add methods to retrieve snd_card and soc_card from dapm context.
        ASoC: SAMSUNG: Add I2S0 internal dma driver
        ASoC: SAMSUNG: Modify I2S driver to support idma
        ASoC: davinci: add missing break statement
        ASoC: davinci: fix codec start and stop functions
        ASoC: dapm - add DAPM macro for external enum widgets
        ASoC: Acknowledge WM8962 interrupts before acting on them
        ASoC: sgtl5000: guide user when regulator support is needed
        ASoC: sgtl5000: refactor registering internal ldo
        ...
      75623437
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 70a3eff5
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (53 commits)
        Input: synaptics - fix reporting of min coordinates
        Input: tegra-kbc - enable key autorepeat
        Input: kxtj9 - fix locking typo in kxtj9_set_poll()
        Input: kxtj9 - fix bug in probe()
        Input: intel-mid-touch - remove pointless checking for variable 'found'
        Input: hp_sdc - staticize hp_sdc_kicker()
        Input: pmic8xxx-keypad - fix a leak of the IRQ during init failure
        Input: cy8ctmg110_ts - set reset_pin and irq_pin from platform data
        Input: cy8ctmg110_ts - constify i2c_device_id table
        Input: cy8ctmg110_ts - fix checking return value of i2c_master_send
        Input: lifebook - make dmi callback functions return 1
        Input: atkbd - make dmi callback functions return 1
        Input: gpio_keys - switch to using SIMPLE_DEV_PM_OPS
        Input: gpio_keys - add support for device-tree platform data
        Input: aiptek - remove double define
        Input: synaptics - set minimum coordinates as reported by firmware
        Input: synaptics - process button bits in AGM packets
        Input: synaptics - rename set_slot to be more descriptive
        Input: synaptics - fuzz position for touchpad with reduced filtering
        Input: synaptics - set resolution for MT_POSITION_X/Y axes
        ...
      70a3eff5
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze · 9ed3689b
      Linus Torvalds authored
      * 'next' of git://git.monstr.eu/linux-2.6-microblaze:
        microblaze: Do not show error message for 32 interrupt lines
        Revert "microblaze: PCI fix typo fault in of_node pointer moving into pci_bus"
        microblaze: PCI fix typo fault in of_node pointer moving into pci_bus
        microblaze: Add support for early console on mdm
        microblaze: Simplify early console binding from DT
        microblaze: Get early printk console earlier
        microblaze: Standardise cpuinfo output for cache policy
        microblaze: Unprivileged stream instruction awareness
        microblaze: trivial: Fix typo fault
        microblaze: exec: Remove redundant set_fs(USER_DS)
        microblaze: Remove duplicated prototype of start_thread()
        microblaze: Fix unaligned value saving to the stack for system with MMU
        microblaze/irqs: Do not trace arch_local_{*,irq_*} functions
      9ed3689b
    • Daniel Morsing's avatar
      staging: brcm80211: Fix double include introduced by bad merge · 8aae36cd
      Daniel Morsing authored
      A merge with Linus' tree added a double include of linux/interrupt.h.
      Fix by removing one of the includes.
      Signed-off-by: default avatarDaniel Morsing <daniel.morsing@gmail.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      8aae36cd
    • Michal Simek's avatar
      microblaze: Do not show error message for 32 interrupt lines · 36392294
      Michal Simek authored
      When interrupt controller uses 32 interrupts lines the kernel
      show error message about mismatch in kind-of-intr parameter
      because it exceeds u32. Recast fixs this issue.
      Signed-off-by: default avatarMichal Simek <monstr@monstr.eu>
      36392294
    • Dmitry Torokhov's avatar
      Merge branch 'next' into for-linus · aa7eb8e7
      Dmitry Torokhov authored
      aa7eb8e7
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 · e371d46a
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
        merge fchmod() and fchmodat() guts, kill ancient broken kludge
        xfs: fix misspelled S_IS...()
        xfs: get rid of open-coded S_ISREG(), etc.
        vfs: document locking requirements for d_move, __d_move and d_materialise_unique
        omfs: fix (mode & S_IFDIR) abuse
        btrfs: S_ISREG(mode) is not mode & S_IFREG...
        ima: fmode_t misspelled as mode_t...
        pci-label.c: size_t misspelled as mode_t
        jffs2: S_ISLNK(mode & S_IFMT) is pointless
        snd_msnd ->mode is fmode_t, not mode_t
        v9fs_iop_get_acl: get rid of unused variable
        vfs: dont chain pipe/anon/socket on superblock s_inodes list
        Documentation: Exporting: update description of d_splice_alias
        fs: add missing unlock in default_llseek()
      e371d46a
    • Linus Torvalds's avatar
      Merge branch 'next/devel2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc · b0189cd0
      Linus Torvalds authored
      * 'next/devel2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc: (47 commits)
        OMAP: Add debugfs node to show the summary of all clocks
        OMAP2+: hwmod: Follow the recommended PRCM module enable sequence
        OMAP2+: clock: allow per-SoC clock init code to prevent clockdomain calls from clock code
        OMAP2+: clockdomain: Add per clkdm lock to prevent concurrent state programming
        OMAP2+: PM: idle clkdms only if already in idle
        OMAP2+: clockdomain: add clkdm_in_hwsup()
        OMAP2+: clockdomain: Add 2 APIs to control clockdomain from hwmod framework
        OMAP: clockdomain: Remove redundant call to pwrdm_wait_transition()
        OMAP4: hwmod: Introduce the module control in hwmod control
        OMAP4: cm: Add two new APIs for modulemode control
        OMAP4: hwmod data: Add modulemode entry in omap_hwmod structure
        OMAP4: hwmod data: Add PRM context register offset
        OMAP4: prm: Remove deprecated functions
        OMAP4: prm: Replace warm reset API with the offset based version
        OMAP4: hwmod: Replace RSTCTRL absolute address with offset macros
        OMAP: hwmod: Wait the idle status to be disabled
        OMAP4: hwmod: Replace CLKCTRL absolute address with offset macros
        OMAP2+: hwmod: Init clkdm field at boot time
        OMAP4: hwmod data: Add clock domain attribute
        OMAP4: clock data: Add missing divider selection for auxclks
        ...
      b0189cd0
    • Linus Torvalds's avatar
      Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc · 69f1d1a6
      Linus Torvalds authored
      * 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc: (128 commits)
        ARM: S5P64X0: External Interrupt Support
        ARM: EXYNOS4: Enable MFC on Samsung NURI
        ARM: EXYNOS4: Enable MFC on universal_c210
        ARM: S5PV210: Enable MFC on Goni
        ARM: S5P: Add support for MFC device
        ARM: EXYNOS4: Add support FIMD on SMDKC210
        ARM: EXYNOS4: Add platform device and helper functions for FIMD
        ARM: EXYNOS4: Add resource definition for FIMD
        ARM: EXYNOS4: Change devname for FIMD clkdev
        ARM: SAMSUNG: Add IRQ_I2S0 definition
        ARM: SAMSUNG: Add platform device for idma
        ARM: EXYNOS4: Add more registers to be saved and restored for PM
        ARM: EXYNOS4: Add more register addresses of CMU
        ARM: EXYNOS4: Add platform device for dwmci driver
        ARM: EXYNOS4: configure rtc-s3c on NURI
        ARM: EXYNOS4: configure MAX8903 secondary charger on NURI
        ARM: EXYNOS4: configure ADC on NURI
        ARM: EXYNOS4: configure MAX17042 fuel gauge on NURI
        ARM: EXYNOS4: configure regulators and PMIC(MAX8997) on NURI
        ARM: EXYNOS4: Increase NR_IRQS for devices with more IRQs
        ...
      
      Fix up tons of silly conflicts:
       - arch/arm/mach-davinci/include/mach/psc.h
       - arch/arm/mach-exynos4/Kconfig
       - arch/arm/mach-exynos4/mach-smdkc210.c
       - arch/arm/mach-exynos4/pm.c
       - arch/arm/mach-imx/mm-imx1.c
       - arch/arm/mach-imx/mm-imx21.c
       - arch/arm/mach-imx/mm-imx25.c
       - arch/arm/mach-imx/mm-imx27.c
       - arch/arm/mach-imx/mm-imx31.c
       - arch/arm/mach-imx/mm-imx35.c
       - arch/arm/mach-mx5/mm.c
       - arch/arm/mach-s5pv210/mach-goni.c
       - arch/arm/mm/Kconfig
      69f1d1a6
    • Linus Torvalds's avatar
      Merge branch 'next/board' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc · 2d86a3f0
      Linus Torvalds authored
      * 'next/board' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc:
        ARM: S3C64XX: Configure backup battery charger on Cragganmore
        ARM: S3C64XX: Fix WM8915 IRQ polarity on Cragganmore
        ARM: S3C64XX: Configure supplies for all Cragganmore regulators
        ARM: S3C64XX: Refresh Cragganmore support
        ARM: S3C64XX: Initial support for Wolfson/Simtec Cragganmore/Banff
        OMAP4: Keyboard: Mux changes in the board file
        omap: blaze: add mmc5/wl1283 device support
        omap: 4430SDP: Register the card detect GPIO properly
        arm: omap3: cm-t35: add support for cm-t3730
        OMAP3: beagle: add support for beagleboard xM revision C
        OMAP3: rx-51: Add full regulator definitions
        omap: rx51: Platform support for lp5523 led chip
      2d86a3f0
    • Linus Torvalds's avatar
      Merge branch 'next/cross-platform' of... · 3960ef32
      Linus Torvalds authored
      Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
      
      * 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc:
        ARM: Consolidate the clkdev header files
        ARM: set vga memory base at run-time
        ARM: convert PCI defines to variables
        ARM: pci: make pcibios_assign_all_busses use pci_has_flag
        ARM: remove unnecessary mach/hardware.h includes
        pci: move microblaze and powerpc pci flag functions into asm-generic
        powerpc: rename ppc_pci_*_flags to pci_*_flags
      
      Fix up conflicts in arch/microblaze/include/asm/pci-bridge.h
      3960ef32
    • Linus Torvalds's avatar
      Merge branch 'next/fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc · 62c9072b
      Linus Torvalds authored
      * 'next/fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc: (24 commits)
        ASoC: omap: McBSP: fix build breakage on OMAP1
        OMAP: hwmod: fix the i2c-reset timeout during bootup
        I2C: OMAP2+: add correct functionality flags to all omap2plus i2c dev_attr
        I2C: OMAP2+: Tag all OMAP2+ hwmod defintions with I2C IP revision
        I2C: OMAP1/OMAP2+: create omap I2C functionality flags for each cpu_... test
        I2C: OMAP2+:  Introduce I2C IP versioning constants
        I2C: OMAP2+: increase omap_i2c_dev_attr flags from u8 to u32
        I2C: OMAP2+: Set hwmod flags to only allow 16-bit accesses to i2c
        OMAP4: hwmod data: Change DSS main_clk scheme
        OMAP4: powerdomain data: Remove unsupported MPU powerdomain state
        OMAP4: clock data: Keep GPMC clocks always enabled and hardware managed
        OMAP4: powerdomain data: Fix core mem states and missing cefuse flag
        OMAP2+: PM: Initialise sleep_switch to a non-valid value
        OMAP4: hwmod data: Modify DSS opt clocks
        OMAP4: iommu: fix clock name
        omap: iovmm: s/sg_dma_len(sg)/sg->length/
        omap: iommu: fix pte programming
        arm: omap3: cm-t35: fix slow path warning
        arm: omap3: cm-t35: minor comments fixes
        omap: ZOOM: QUART: Request reset GPIO
        ...
      62c9072b
    • Linus Torvalds's avatar
      Merge branch 'next/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc · 4b30b6f2
      Linus Torvalds authored
      * 'next/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc:
        MAINTAINERS: add maintainer of CSR SiRFprimaII machine
        ARM: CSR: initializing L2 cache
        ARM: CSR: mapping early DEBUG_LL uart
        ARM: CSR: Adding CSR SiRFprimaII board support
        OMAP4: clocks: Update the clock tree with 4460 clock nodes
        OMAP4: PRCM: OMAP4460 specific PRM and CM register bitshifts
        OMAP4: ID: add omap_has_feature for max freq supported
        OMAP: ID: introduce chip detection for OMAP4460
        ARM: Xilinx: merge board file into main platform code
        ARM: Xilinx: Adding Xilinx board support
      
      Fix up conflicts in arch/arm/mach-omap2/cm-regbits-44xx.h
      4b30b6f2
  2. 26 Jul, 2011 25 commits