From: Maxim Uvarov <maxim.uvarov@oracle.com>
Date: Wed, 27 Jun 2012 09:54:20 +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~517
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=cd315b80018c04568ce580d5915de09cc4c863d2;p=users%2Fjedix%2Flinux-maple.git

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

cd315b80018c04568ce580d5915de09cc4c863d2