From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 1 Apr 2010 16:13:57 +0000 (-0700)
Subject: Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platf... 
X-Git-Tag: v2.6.34-rc4~90
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c7681f4637df65082aeee1ea1ff0479607d71982;p=profile%2Fivi%2Fkernel-x86-ivi.git

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
---

c7681f4637df65082aeee1ea1ff0479607d71982