commit | c7681f4637df65082aeee1ea1ff0479607d71982 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Apr 01 09:13:57 2010 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Apr 01 09:13:57 2010 -0700 |
tree | bb271f9008cf6328a813a8097bb83adf0bc4ffba | |
parent | b95c35e76b29ba812e5dabdd91592e25ec640e93 [diff] | |
parent | ee027e4aed3077c4bb3b585c67528eec0e7222df [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: eeepc-wmi: new driver for WMI based hotkeys on Eee PC laptops asus-laptop: fix warning in asus_handle_init