From: Maxim Uvarov <maxim.uvarov@oracle.com>
Date: Fri, 21 Sep 2012 12:07:22 +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~309
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e7c1379a735f74c454da300e62a62f7ed4f5dd19;p=users%2Fjedix%2Flinux-maple.git

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

e7c1379a735f74c454da300e62a62f7ed4f5dd19