Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platf...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 1 Apr 2010 16:13:57 +0000 (09:13 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 1 Apr 2010 16:13:57 +0000 (09:13 -0700)
commitc7681f4637df65082aeee1ea1ff0479607d71982
treebb271f9008cf6328a813a8097bb83adf0bc4ffba
parentb95c35e76b29ba812e5dabdd91592e25ec640e93
parentee027e4aed3077c4bb3b585c67528eec0e7222df
Merge branch 'for_linus' of git://git./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