]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge tag 'v4.1.6-12#22003659a4' of git://ca-git/linux-dduval-public into topic/uek...
authorSantosh Shilimkar <santosh.shilimkar@oracle.com>
Mon, 19 Oct 2015 20:50:35 +0000 (13:50 -0700)
committerSantosh Shilimkar <santosh.shilimkar@oracle.com>
Mon, 19 Oct 2015 20:50:35 +0000 (13:50 -0700)

Trivial merge