From: Len Brown <len.brown@intel.com>
Date: Thu, 7 Feb 2008 08:11:56 +0000 (-0500)
Subject: Merge branches 'release' and 'hp-cid' into release
X-Git-Tag: v2.6.25-rc1~297^2~3^2~2^2~1^2~3
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d870ec7281d8429ab17d2e0324f4d8ca3f3de62d;p=users%2Fwilly%2Flinux.git

Merge branches 'release' and 'hp-cid' into release
---

d870ec7281d8429ab17d2e0324f4d8ca3f3de62d