1. 28 7月, 2011 3 次提交
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 70a3eff5
      Linus Torvalds 提交于
      * '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
    • L
      Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze · 9ed3689b
      Linus Torvalds 提交于
      * '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
    • D
      staging: brcm80211: Fix double include introduced by bad merge · 8aae36cd
      Daniel Morsing 提交于
      A merge with Linus' tree added a double include of linux/interrupt.h.
      Fix by removing one of the includes.
      Signed-off-by: NDaniel Morsing <daniel.morsing@gmail.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      8aae36cd
  2. 27 7月, 2011 37 次提交