]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch 'topic/uek-4.1/upstream-cherry-picks' into uek/uek-4.1
authorChuck Anderson <chuck.anderson@oracle.com>
Tue, 19 Jan 2016 15:52:13 +0000 (07:52 -0800)
committerChuck Anderson <chuck.anderson@oracle.com>
Tue, 19 Jan 2016 15:52:13 +0000 (07:52 -0800)

Trivial merge