]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch 'uek2-oracleasm' of ca-git.us.oracle.com:linux-mkp-public into uek2...
authorMaxim Uvarov <maxim.uvarov@oracle.com>
Wed, 30 Nov 2011 01:19:46 +0000 (17:19 -0800)
committerMaxim Uvarov <maxim.uvarov@oracle.com>
Wed, 30 Nov 2011 01:19:46 +0000 (17:19 -0800)

Trivial merge