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

Trivial merge