From: Len Brown <len.brown@intel.com>
Date: Thu, 22 Jul 2010 22:17:39 +0000 (-0400)
Subject: Merge branch 'bugzilla-16271' into release
X-Git-Tag: v2.6.35~38^2~5
X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=855977ef6d07e8d1d50994ab7310e40d18a64e16;p=net-next-2.6.git

Merge branch 'bugzilla-16271' into release
---

855977ef6d07e8d1d50994ab7310e40d18a64e16