Hans de Goede
0f68f39c39
Input: synaptics - change min/max quirk table to pnp-id matching ...
Most of the affected models share pnp-ids for the touchpad. So switching
to pnp-ids give us 2 advantages:
1) It shrinks the quirk list
2) It will lower the new quirk addition frequency, ie the recently added W540
quirk would not have been necessary since it uses the same LEN0034 pnp ids
as other models already added before it
As an added bonus it actually puts the quirk on the actual psmouse, rather
then on the machine, which is technically more correct.
Cc: stable@vger.kernel.org
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
2014-05-26 15:02:00 -07:00
Merge branches 'acpi-pm' and 'acpi-video'
2014-02-21 01:28:12 +01:00
PCI updates for v3.14:
2014-02-20 12:46:24 -08:00
Small dma-buf pull request for 3.14
2014-02-17 12:42:45 -08:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2014-01-30 17:20:32 -08:00
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
2014-02-14 10:45:18 -08:00
drivers: bus: fix CCI driver kcalloc call parameters swap
2014-01-31 15:15:13 -08:00
Merge branch 'for-3.14/drivers' of git://git.kernel.dk/linux-block
2014-01-30 11:40:10 -08:00
Char/Misc fixes for 3.14-rc3
2014-02-14 16:13:00 -08:00
The second half of the clock framework pull requeust for 3.14 is
2014-01-28 18:44:53 -08:00
clocksource: Kona: Print warning rather than panic
2014-02-06 16:01:40 +01:00
intel_pstate: Add support for Baytrail turbo P states
2014-02-21 01:22:40 +01:00
powerpc/powernv/cpuidle: Back-end cpuidle driver for powernv platform.
2014-01-29 17:02:24 +11:00
crypto/nx/nx-842: Fix handling of vmalloc addresses
2014-02-11 11:24:49 +11:00
Merge branches 'pm-cpufreq' and 'pm-devfreq'
2014-01-29 11:48:23 +01:00
dma: mv_xor: Silence a bunch of LPAE-related warnings
2014-02-12 16:21:17 -08:00
EDAC: Correct workqueue setup path
2014-02-14 10:40:47 +01:00
Revert "EISA: Initialize device before its resources"
2014-01-17 14:57:29 -07:00
firewire: Enable remote DMA above 4 GB
2014-01-20 01:11:13 +01:00
firmware/google: drop 'select EFI' to avoid recursive dependency
2014-01-27 21:02:40 -08:00
gpio: tb10x: GPIO_TB10X needs to select GENERIC_IRQ_CHIP
2014-02-05 11:13:59 +01:00
ACPI and power management fixes for 3.14-rc4
2014-02-21 10:01:17 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
2014-02-18 16:29:46 -08:00
Drivers: hv: vmbus: Don't timeout during the initial connection with host
2014-02-07 08:27:34 -08:00
hwmon: (max1668) Fix writing the minimum temperature
2014-02-18 15:53:49 -08:00
i2c: mv64xxx: refactor message start to ensure proper initialization
2014-02-15 15:42:31 +01:00
drivers: ide: Include appropriate header file in ide-pio-blacklist.c
2014-01-28 23:35:09 -08:00
ACPI and power management updates for 3.14-rc1
2014-01-24 15:51:02 -08:00
iio: max1363: Use devm_regulator_get_optional for optional regulator
2014-02-08 11:46:00 +00:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2014-02-15 16:18:47 -08:00
Input: synaptics - change min/max quirk table to pnp-id matching
2014-05-26 15:02:00 -07:00
arm/smmu: Use irqsafe spinlock for domain lock
2014-02-20 13:04:47 +01:00
irqchip mvebu fixes for v3.14
2014-02-21 23:57:33 +01:00
isdn/hisax: hex vs decimal typo in prfeatureind()
2014-02-06 21:18:06 -08:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds
2014-01-28 18:53:01 -08:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2014-01-27 21:11:26 -08:00
drivers/mailbox/omap: make mbox->irq signed for error handling
2014-01-23 16:36:53 -08:00
Two bugfixes for md
2014-02-14 12:48:16 -08:00
[media] adv7842: Composite free-run platfrom-data fix
2014-02-04 06:46:10 -02:00
drivers/memstick/host/rtsx_pci_ms.c: fix ms card data transfer bug
2014-01-23 16:37:04 -08:00
drivers/message/i2o/i2o_config.c: fix deadlock in compat_ioctl(I2OGETIOPS)
2014-02-10 16:01:40 -08:00
sound fixes for 3.14-rc4
2014-02-21 09:55:32 -08:00
mei: set client's read_cb to NULL when flow control fails
2014-02-18 10:07:36 -08:00
Fix uses of dma_max_pfn() when converting to a limiting address
2014-02-17 23:08:41 +00:00
* Improve the NOR erasure quirk - now it tries to do as little writes as
2014-01-30 20:04:09 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-02-18 15:52:43 -08:00
Device tree compatible match order bug fix
2014-02-21 14:35:05 -08:00
TTY/Serial driver patches for 3.14-rc1
2014-01-20 16:05:23 -08:00
PCI updates for v3.14:
2014-02-20 12:46:24 -08:00
PCI changes for the v3.14 merge window:
2014-01-22 16:39:28 -08:00
phy: let phy_provider_register be the last step in registering PHY
2014-02-18 12:13:16 -08:00
pinctrl: tegra: return correct error type
2014-02-06 14:21:19 +01:00
platform/chrome: Cleanups and improvements
2014-01-29 20:06:01 -08:00
Few fixes:
2014-02-14 10:32:28 -08:00
pwm: Changes for v3.14-rc1
2014-01-27 08:15:51 -08:00
Merge remote-tracking branches 'regulator/fix/da9063', 'regulator/fix/max14577' and 'regulator/fix/s5m8767' into regulator-linus
2014-02-23 12:22:18 +09:00
Merge branch 'akpm' (incoming from Andrew)
2014-01-23 19:11:50 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
2014-02-11 12:23:50 -08:00
Sparc: sparc_cpu_model isn't in asm/system.h any more [ver #2 ]
2014-02-20 13:34:11 -05:00
Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
2014-02-18 15:49:58 -08:00
Merge remote-tracking branches 'spi/fix/doc', 'spi/fix/nuc900' and 'spi/fix/rspi' into spi-linus
2014-02-11 12:08:27 +00:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2014-01-30 17:20:32 -08:00
Staging tree fix for 3.14-rc4
2014-02-23 10:39:21 -08:00
Target/sbc: Fix protection copy routine
2014-02-12 15:14:45 -08:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
2014-01-24 17:13:49 -08:00
Revert "tty: Set correct tty name in 'active' sysfs attribute"
2014-02-22 14:31:04 -08:00
usb: chipidea: need to mask when writting endptflush and endptprime
2014-02-21 12:34:45 -08:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2014-01-27 21:11:26 -08:00
vhost: fix a theoretical race in device cleanup
2014-02-13 18:47:30 -05:00
video: Kconfig: Allow more broad selection of the imxfb framebuffer driver.
2014-02-14 10:44:52 +02:00
A few simple fixes. Quiet cycle.
2014-01-22 22:24:35 -08:00
drivers/vlynq/vlynq.c: fix another resource size off by 1 error
2014-01-23 16:36:55 -08:00
VME: Correct read/write alignment algorithm
2014-02-07 08:16:14 -08:00
drivers/w1/masters/w1-gpio.c: add strong pullup emulation
2014-01-23 16:37:04 -08:00
watchdog: w83697hf_wdt: return ENODEV if no device was found
2014-02-21 20:36:46 +01:00
Bug-fix:
2014-02-12 12:28:05 -08:00
0f68f39c39