]> git.hungrycats.org Git - linux/commitdiff
Merge tag 'v3.18.12' into zygo-3.18.12-zb64-btrfs
authorZygo Blaxell <zblaxell@serenity.furryterror.org>
Thu, 23 Apr 2015 02:28:58 +0000 (22:28 -0400)
committerZygo Blaxell <zblaxell@serenity.furryterror.org>
Thu, 23 Apr 2015 02:28:58 +0000 (22:28 -0400)
Linux 3.18.12

# gpg: Signature made Mon Apr 20 15:48:50 2015 EDT using RSA key ID 97772CDC
# gpg: Can't check signature: public key not found


Trivial merge