From: Maxim Uvarov <maxim.uvarov@oracle.com>
Date: Thu, 26 Jul 2012 13:11:26 +0000 (-0700)
Subject: Merge branch 'uek2-merge' of git://ca-git.us.oracle.com/linux-konrad-public
X-Git-Tag: v2.6.39-400.9.0~439
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=85232ccf902b159e99c859b045aa88783ef93581;p=users%2Fjedix%2Flinux-maple.git

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

85232ccf902b159e99c859b045aa88783ef93581