]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch topic/uek-4.1/xen of git://ca-git.us.oracle.com/linux-uek into uek/uek-4.1
authorChuck Anderson <chuck.anderson@oracle.com>
Sun, 31 Jul 2016 18:18:42 +0000 (11:18 -0700)
committerChuck Anderson <chuck.anderson@oracle.com>
Sun, 31 Jul 2016 18:18:42 +0000 (11:18 -0700)

Trivial merge