Merge branch 'asus' into release
authorLen Brown <len.brown@intel.com>
Wed, 16 Dec 2009 03:34:48 +0000 (22:34 -0500)
committerLen Brown <len.brown@intel.com>
Wed, 16 Dec 2009 03:34:48 +0000 (22:34 -0500)
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/platform/x86/eeepc-laptop.c

Signed-off-by: Len Brown <len.brown@intel.com>

Trivial merge