From: Maxim Uvarov <maxim.uvarov@oracle.com>
Date: Wed, 25 Apr 2012 23:45:23 +0000 (-0700)
Subject: Merge branch 'uek2-merge' of git://ca-git.us.oracle.com/linux-konrad-public into... 
X-Git-Tag: v2.6.39-400.9.0~426^2~5
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=094cb5bf89519d52781e8b00d63b46452ad6f2ec;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'uek2-merge' of git://ca-git.us.oracle.com/linux-konrad-public into uek-2.6.39-200
---

094cb5bf89519d52781e8b00d63b46452ad6f2ec