From: Guangyu Sun <guangyu.sun@oracle.com>
Date: Fri, 23 Mar 2012 16:33:26 +0000 (-0700)
Subject: Merge branch 'linux-3.0.y' into uek2-stable
X-Git-Tag: v2.6.39-400.9.0~565^2~5
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d171601b64b88af8032ee301a81c1eab88f227a8;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'linux-3.0.y' into uek2-stable
---

d171601b64b88af8032ee301a81c1eab88f227a8