diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-17 18:36:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-17 18:36:01 -0700 |
| commit | 472db19ff5729cc9d054d6f87ba5147b21ec0787 (patch) | |
| tree | aaf668be928c784ea3e1d0d9582635802c24a423 /net/can | |
| parent | 351f13d7087d4f633552d0e5491adf049fc9276c (diff) | |
| parent | c3f755e3842108c1cffe570fe9802239810352b6 (diff) | |
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:
platform/x86: move rfkill for Dell Mini 1012 to compal-laptop
thinkpad-acpi: Add KEY_CAMERA (Fn-F6) for Lenovo keyboards
thinkpad-acpi: add support for model-specific keymaps
thinkpad-acpi: lock down size of hotkey keymap
thinkpad-acpi: untangle ACPI/vendor backlight selection
thinkpad-acpi: find ACPI video device by synthetic HID
intel_ips: potential null dereference
drivers/platform/x86: Adjust confusing if indentation
x86: intel_ips: do not use PCI resources before pci_enable_device()
Diffstat (limited to 'net/can')
0 files changed, 0 insertions, 0 deletions