From: Len Brown <len.brown@intel.com>
Date: Thu, 23 Oct 2008 03:35:56 +0000 (-0400)
Subject: Merge branch 'yinghai' into test
X-Git-Tag: v2.6.28-rc1~26^2~9
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1b79b27da172d6c868746135feeb71de4ddd0646;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'yinghai' into test
---

1b79b27da172d6c868746135feeb71de4ddd0646