]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch 'uek2-merge' of git://ca-git.us.oracle.com/linux-konrad-public
authorMaxim Uvarov <maxim.uvarov@oracle.com>
Wed, 27 Jun 2012 09:54:20 +0000 (13:54 +0400)
committerMaxim Uvarov <maxim.uvarov@oracle.com>
Wed, 27 Jun 2012 09:54:20 +0000 (13:54 +0400)

Trivial merge