]> git.hungrycats.org Git - linux/commitdiff
Merge remote-tracking branch 'serenity/zygo-3.4.25-zb5s' into zygo-3.4.25-zb5s zygo-3.4.25-zb5s
authorZygo Blaxell <zblaxell@waya.furryterror.org>
Sun, 25 Jan 2015 22:30:58 +0000 (17:30 -0500)
committerZygo Blaxell <zblaxell@waya.furryterror.org>
Sun, 25 Jan 2015 22:30:58 +0000 (17:30 -0500)

Trivial merge