From: Len Brown <len.brown@intel.com>
Date: Thu, 22 Jul 2010 22:17:33 +0000 (-0400)
Subject: Merge branch 'bugzilla-16357' into release
X-Git-Tag: v2.6.35~38^2~6
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=840ba24dd615e71154f0faab136b744c0a481041;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'bugzilla-16357' into release
---

840ba24dd615e71154f0faab136b744c0a481041