From: Len Brown <len.brown@intel.com>
Date: Wed, 16 Dec 2009 03:34:48 +0000 (-0500)
Subject: Merge branch 'asus' into release
X-Git-Tag: v2.6.33-rc1~47^2~16
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a3bff236b51583eaac7c2f0bd1db0dcf7b36a5c;p=pandora-kernel.git

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

9a3bff236b51583eaac7c2f0bd1db0dcf7b36a5c
Reading git-diff-tree failed