]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch 'uek2-200-di' of git://ca-git.us.oracle.com/linux-mkp-public into uek...
authorMaxim Uvarov <maxim.uvarov@oracle.com>
Fri, 15 Jun 2012 18:43:40 +0000 (22:43 +0400)
committerMaxim Uvarov <maxim.uvarov@oracle.com>
Fri, 15 Jun 2012 18:43:40 +0000 (22:43 +0400)

Trivial merge