From: Len Brown <len.brown@intel.com>
Date: Thu, 7 Feb 2008 08:19:43 +0000 (-0500)
Subject: Merge branches 'release' and 'wmi-2.6.25' into release
X-Git-Tag: v2.6.25-rc1~297^2~3^2~2^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=060195500e0347a6ba8ea89739a9898961eb6f2b;p=linux-2.6-omap-h63xx.git

Merge branches 'release' and 'wmi-2.6.25' into release
---

060195500e0347a6ba8ea89739a9898961eb6f2b