From: Len Brown <len.brown@intel.com>
Date: Thu, 24 Dec 2009 06:16:35 +0000 (-0500)
Subject: Merge branch 'osc' into release
X-Git-Tag: v2.6.33-rc2~3^2~6
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=6f5464ce154bc72c67bbc82e818e4fdd61cb9f8e;p=~andy%2Flinux

Merge branch 'osc' into release
---

6f5464ce154bc72c67bbc82e818e4fdd61cb9f8e