]> git.hungrycats.org Git - linux/commitdiff
Merge remote-tracking branches 'mason/for-linus' and 'linus/master' into zygo-3.17...
authorZygo Blaxell <zblaxell@serenity.furryterror.org>
Fri, 23 Jan 2015 15:12:16 +0000 (10:12 -0500)
committerZygo Blaxell <zblaxell@serenity.furryterror.org>
Fri, 23 Jan 2015 15:12:16 +0000 (10:12 -0500)

Trivial merge