Pull thinkpad into release branch
authorLen Brown <len.brown@intel.com>
Sun, 29 Apr 2007 03:11:19 +0000 (23:11 -0400)
committerLen Brown <len.brown@intel.com>
Sun, 29 Apr 2007 03:11:19 +0000 (23:11 -0400)
Conflicts:

drivers/misc/Kconfig

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

Trivial merge