diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-21 23:08:33 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-21 23:08:33 (GMT) |
| commit | 5fb24b8109e0cb343cc89cb148a836d490caa456 (patch) | |
| tree | c8d97a55a303c8c710d8dc7888c52554960cb4b2 /drivers/char/nwflash.c | |
| parent | 99273ac4dc4db0cfb38fec65d4afb8a0f6bc6e58 (diff) | |
| parent | a3d77411e8b2ad661958c1fbee65beb476ec6d70 (diff) | |
| download | linux-fsl-qoriq-5fb24b8109e0cb343cc89cb148a836d490caa456.tar.xz | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86:
dell-laptop: Toggle the unsupported hardware killswitch
thinkpad_acpi: Always report scancodes for hotkeys
acer-wmi: Fix capitalisation of GUID
platform/x86: ideapad-laptop depends on INPUT
platform: x86: acer-wmi: world-writable sysfs threeg file
platform: x86: asus_acpi: world-writable procfs files
platform: x86: tc1100-wmi: world-writable sysfs wireless and jogdial files
platform-drivers: x86: pmic: Use request_irq instead of chained handler
platform-drivers: x86: pmic: Use irq_chip buslock mechanism
platform-drivers: x86: Convert pmic to new irq_chip functions
platform-drivers: x86: pmic: Fix up bogus irq hackery
Diffstat (limited to 'drivers/char/nwflash.c')
0 files changed, 0 insertions, 0 deletions