Linus Torvalds
155e3a3539
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input ...
Pull input layer updates from Dmitry Torokhov:
"Just a couple of new IDs in Wacom and xpad drivers, i8042 is now
disabled on ARC, and data checks in Elantech driver that were overly
relaxed by the previous patch are now tightened"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: i8042 - disable the driver on ARC platforms
Input: xpad - add signature for Razer Onza Classic Edition
Input: elantech - fix packet check for v3 and v4 hardware
Input: wacom - add support for 0x300 and 0x301
2013-08-30 16:15:52 -07:00
printk: move braille console support into separate braille.[ch] files
2013-07-31 14:41:03 -07:00
Revert "ACPI / video: Always call acpi_video_init_brightness() on init"
2013-08-22 23:39:02 +02:00
sata_fsl: save irqs while coalescing
2013-08-20 08:38:23 -04:00
drivers/base/memory.c: fix show_mem_removable() to handle missing sections
2013-08-28 19:26:38 -07:00
aoe: adjust ref of head for compound page tails
2013-08-13 17:57:48 -07:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
2013-07-31 15:11:50 -04:00
ARM SoC device tree changes
2013-07-02 14:23:01 -07:00
drivers/cdrom/cdrom.c: use kzalloc() for failing hardware
2013-07-03 16:07:25 -07:00
More virtio console fixes than I'm happy with, but all real issues,
2013-08-08 09:32:20 -07:00
clk: exynos4: Add CLK_GET_RATE_NOCACHE flag for the Exynos4x12 ISP clocks
2013-08-13 10:01:56 -07:00
clocksource+irqchip: delete __cpuinit usage from all related files
2013-07-14 19:36:57 -04:00
cpufreq: rename ignore_nice as ignore_nice_load
2013-08-07 22:25:06 +02:00
Revert "cpuidle: Quickly notice prediction failure for repeat mode"
2013-07-29 13:32:29 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2013-07-24 11:05:18 -07:00
Merge branch 'akpm' (updates from Andrew Morton)
2013-07-03 17:12:13 -07:00
ARM: SoC fixes for v3.11-rc
2013-08-08 09:28:08 -07:00
EDAC: Fix lockdep splat
2013-07-23 16:01:28 -07:00
drivers: avoid format string in dev_set_name
2013-07-03 16:07:41 -07:00
firewire: fix libdc1394/FlyCap2 iso event regression
2013-07-27 20:24:36 +02:00
dmi_scan: add comments on dmi_present() and the loop in dmi_scan_machine()
2013-07-31 14:41:02 -07:00
gpio_msm: Fix build error due to missing err.h
2013-07-31 00:34:31 +02:00
Merge tag 'drm-intel-fixes-2013-08-23' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes
2013-08-23 18:52:37 +10:00
Revert "HID: hid-logitech-dj: querying_devices was never set"
2013-08-09 11:34:19 +02:00
drivers: avoid format string in dev_set_name
2013-07-03 16:07:41 -07:00
Drivers: hv: balloon: Do not post pressure status if interrupted
2013-07-16 23:19:19 -07:00
hwmon: (adt7470) Fix incorrect return code check
2013-08-08 12:43:07 -07:00
i2c: Fix Kontron PLD prescaler calculation
2013-08-05 10:31:18 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
2013-07-10 18:15:41 -07:00
iio: adjd_s311: Fix non-scan mode data read
2013-08-19 19:30:21 +01:00
Merge branches 'cma', 'cxgb3', 'cxgb4', 'ipoib', 'misc', 'mlx4', 'mlx5', 'nes', 'ocrdma' and 'qib' into for-next
2013-07-31 14:24:06 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2013-08-30 16:15:52 -07:00
IOMMU Updates for Linux 3.11
2013-07-10 14:46:40 -07:00
clocksource+irqchip: delete __cpuinit usage from all related files
2013-07-14 19:36:57 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-07-09 18:24:39 -07:00
leds: mc13783: Fix "uninitialized variable" warning
2013-07-02 08:44:02 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-07-04 11:40:58 -07:00
powerpc/windfarm: Fix noisy slots-fan on Xserve (rm31)
2013-08-01 13:11:47 +10:00
dm cache: avoid conflicting remove_mapping() in mq policy
2013-08-16 15:56:51 -04:00
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2013-08-09 15:04:09 -07:00
drivers/memstick/host/r592.c: convert to module_pci_driver
2013-07-03 16:08:06 -07:00
drivers: avoid format strings in names passed to alloc_workqueue()
2013-07-03 16:07:41 -07:00
For the 3.11 merge we only have one new MFD driver for the Kontron PLD.
2013-07-10 11:10:27 -07:00
Char/Misc patches for 3.11-rc3
2013-07-26 11:36:12 -07:00
ARM: pxa: propagate errors from regulator_enable() to pxamci
2013-07-23 12:15:15 -07:00
A couple of fixes and clean-ups, allow for assigning user-defined
2013-07-05 12:09:48 -07:00
be2net: fix disabling TX in be_close()
2013-08-22 19:58:23 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-07-09 18:24:39 -07:00
of: fdt: fix memory initialization for expanded DT
2013-08-21 20:05:49 -05:00
drivers: delete __cpuinit usage from all remaining drivers files
2013-07-14 19:36:59 -04:00
parisc: Fix interrupt routing for C8000 serial ports
2013-07-31 23:42:32 +02:00
Merge branch 'akpm' (updates from Andrew Morton)
2013-07-03 17:12:13 -07:00
ACPI: Try harder to resolve _ADR collisions for bridges
2013-08-07 22:55:00 +02:00
Driver core patches for 3.11-rc1
2013-07-02 11:44:19 -07:00
pinctrl: sunxi: Add spinlocks
2013-08-07 21:57:17 +02:00
Merge branch 'akpm' (patches from Andrew Morton)
2013-08-23 09:52:32 -07:00
PNP / ACPI: avoid garbage in resource name
2013-07-18 01:38:59 +02:00
Nothing exciting this time, just assorted fixes and cleanups.
2013-07-10 11:13:00 -07:00
pps-gpio: add device-tree binding and support
2013-07-03 16:08:06 -07:00
rapidio: fix use after free in rio_unregister_scan()
2013-07-31 14:41:02 -07:00
For the 3.11 merge we only have one new MFD driver for the Kontron PLD.
2013-07-10 11:10:27 -07:00
Trivial remoteproc fixes by Suman Anna, Wei Yongjun and Thomas Meyer.
2013-07-11 12:35:09 -07:00
drivers/rtc/rtc-stmp3xxx.c: provide timeout for potentially endless loop polling a HW bit
2013-08-13 17:57:48 -07:00
[SCSI] zfcp: remove access control tables interface (keep sysfs files)
2013-08-22 09:26:51 -07:00
[SCSI] lpfc: Don't force CONFIG_GENERIC_CSUM on
2013-08-21 10:54:20 -07:00
spi: spi-davinci: Fix direction in dma_map_single()
2013-07-29 20:27:54 +01:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2013-07-13 14:52:21 -07:00
staging: comedi: bug-fix NULL pointer dereference on failed attach
2013-08-23 10:31:47 -07:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2013-07-11 12:57:19 -07:00
Thermal: Fix lockup of cpu_down()
2013-07-22 09:34:46 +08:00
powerpc/hvsi: Increase handshake timeout from 200ms to 400ms.
2013-08-27 16:59:56 +10:00
uio: use vma_pages() to replace (vm_end - vm_start) >> PAGE_SHIFT
2013-07-03 16:07:26 -07:00
USB: OHCI: fix build error related to ohci_suspend/resume
2013-08-26 15:22:15 -07:00
drivers: avoid format string in dev_set_name
2013-07-03 16:07:41 -07:00
vfio-pci: Avoid deadlock on remove
2013-07-24 16:36:41 -06:00
vhost: more fixes for 3.11
2013-07-23 14:38:20 -07:00
fbdev fixes:
2013-08-09 11:52:34 -07:00
No real surprises.
2013-07-10 14:50:58 -07:00
drivers/w1/slaves/w1_ds2408.c: add magic sequence to disable P0 test mode
2013-07-03 16:08:06 -07:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2013-07-13 14:52:21 -07:00
Bug-fixes:
2013-08-21 16:38:33 -07:00
zorro: switch to fixed_size_llseek()
2013-06-29 12:57:28 +04:00
For the 3.11 merge we only have one new MFD driver for the Kontron PLD.
2013-07-10 11:10:27 -07:00
For the 3.11 merge we only have one new MFD driver for the Kontron PLD.
2013-07-10 11:10:27 -07:00
155e3a3539