From: Maxim Uvarov <maxim.uvarov@oracle.com>
Date: Thu, 14 Jun 2012 08:56:31 +0000 (+0400)
Subject: Merge branch 'uek2-merge' of git://ca-git.us.oracle.com/linux-konrad-public
X-Git-Tag: v2.6.39-400.9.0~543
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=485f595c5a6a4e130e818c1fa1b68174effe7285;p=users%2Fjedix%2Flinux-maple.git

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

485f595c5a6a4e130e818c1fa1b68174effe7285