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

Trivial merge