From: Len Brown <len.brown@intel.com>
Date: Tue, 18 Mar 2008 09:17:15 +0000 (-0400)
Subject: Merge branches 'release' and 'dock' into release
X-Git-Tag: v2.6.25-rc7~107^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=13d93924f13e1989cf27375cd46451475bc70d1d;p=linux-2.6-omap-h63xx.git

Merge branches 'release' and 'dock' into release
---

13d93924f13e1989cf27375cd46451475bc70d1d