]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
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)
commit9a3bff236b51583eaac7c2f0bd1db0dcf7b36a5c
tree0b4ad1c00078b335e49b5fcb460d02797c19a1ff
parent173cc11a6e10c38ff7d4949b48e8d2eb0aee3e05
parentd951d4cc84e8b5ddb8e0ab81cf6a72cc73fdd668
Merge branch 'asus' into release

Conflicts:
Documentation/feature-removal-schedule.txt
drivers/platform/x86/eeepc-laptop.c

Signed-off-by: Len Brown <len.brown@intel.com>
Documentation/feature-removal-schedule.txt
drivers/platform/x86/eeepc-laptop.c