Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platf...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 24 Apr 2010 18:31:57 +0000 (11:31 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 24 Apr 2010 18:31:57 +0000 (11:31 -0700)
commitb39c8be6d5e38f4478be0c7aaf1d3a160a4dd330
treef53de2f560ca582ad92dc60b826ef693c4c21a13
parentdf37bd156dcb4f5441beaf5bde444adac974e9a0
parentc9db3efee16add57ea459a00dfa00610fcbce931
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-laptop: add missing sparse_keymap_free
  eeepc-wmi: Build fix
  asus: don't modify bluetooth/wlan on boot
  dell-wmi: Fix memory leak
  eeepc-wmi: add backlight support
  eeepc-wmi: use a platform device as parent device of all sub-devices
  eeepc-wmi: add an eeepc_wmi context structure