diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-02 01:51:37 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-02 01:51:37 +0200 |
| commit | 48445159e9ecb44a96a4de06c6ae7c54eb43ba5b (patch) | |
| tree | 992657156c63746d6d43c3b6f7386227a0df34a4 /arch/arm/mach-pxa/generic.h | |
| parent | Merge branch 'slab/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | apple-gmux: Fix up the suspend/resume patch (diff) | |
| download | linux-48445159e9ecb44a96a4de06c6ae7c54eb43ba5b.tar.xz linux-48445159e9ecb44a96a4de06c6ae7c54eb43ba5b.zip | |
Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86
Pull x86 platform driver updates from Matthew Garrett:
"Some significant improvements for the Sony driver on newer machines,
but other than that mostly just minor fixes and a patch to remove the
broken rfkill code from the Dell driver."
* 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86: (35 commits)
apple-gmux: Fix up the suspend/resume patch
dell-laptop: Remove rfkill code
toshiba_acpi: Fix mis-merge
dell-laptop: Add touchpad led support for Dell V3450
acer-wmi: add 3 laptops to video backlight vendor mode quirk table
sony-laptop: add touchpad enable/disable function
sony-laptop: add missing Fn key combos for 0x100 handlers
sony-laptop: add support for more WWAN modems
sony-laptop: new keyboard backlight handle
sony-laptop: add high speed battery charging function
sony-laptop: support automatic resume on lid open
sony-laptop: adjust error handling in finding SNC handles
sony-laptop: add thermal profiles support
sony-laptop: support battery care functions
sony-laptop: additional debug statements
sony-laptop: improve SNC initialization and acpi notify callback code
sony-laptop: use kstrtoul to parse sysfs values
sony-laptop: generalise ACPI calls into SNC functions
sony-laptop: fix return path when no ACPI buffer is allocated
sony-laptop: use soft rfkill status stored in hw
...
Diffstat (limited to 'arch/arm/mach-pxa/generic.h')
0 files changed, 0 insertions, 0 deletions