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)
* '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


Trivial merge