Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86

Browse source

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86:
  eeepc-wmi: new driver for WMI based hotkeys on Eee PC laptops
  asus-laptop: fix warning in asus_handle_init

...

This commit is contained in:

Linus Torvalds 2010-04-01 09:13:57 -07:00

parent b95c35e76b ee027e4aed

commit c7681f4637

4 changed files with 170 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

10

drivers/platform/x86/Kconfig

View file

1

drivers/platform/x86/Makefile

View file

4

drivers/platform/x86/asus-laptop.c

View file

157

drivers/platform/x86/eeepc-wmi.c

View file