From: Len Brown <len.brown@intel.com>
Date: Wed, 16 Dec 2009 19:07:29 +0000 (-0500)
Subject: Merge branch 'osc' into release
X-Git-Tag: v2.6.33-rc1~47^2~1
X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=2900681b25d5a1a1a7b39ab66da3b8c6b1b0b7ad;p=net-next-2.6.git

Merge branch 'osc' into release
---

2900681b25d5a1a1a7b39ab66da3b8c6b1b0b7ad