From: Maxim Uvarov <maxim.uvarov@oracle.com>
Date: Tue, 4 Sep 2012 20:21:41 +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~330
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5bc083dc76a2407ccfc46a7306c2e715cd688a5c;p=users%2Fjedix%2Flinux-maple.git

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

5bc083dc76a2407ccfc46a7306c2e715cd688a5c