]> git.hungrycats.org Git - linux/commitdiff
Merge branch 'zygo-3.17.8-zb64' into waya-3.17.8-zb64 zygo-3.17.8-zb64
authorZygo Blaxell <zblaxell@waya.furryterror.org>
Fri, 23 Jan 2015 23:08:14 +0000 (18:08 -0500)
committerZygo Blaxell <zblaxell@waya.furryterror.org>
Fri, 23 Jan 2015 23:08:14 +0000 (18:08 -0500)

Trivial merge