]> git.hungrycats.org Git - linux/commitdiff
projects / linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 23f5f74 89e4199)
Merge tag 'v4.1.4' into zygo-4.1.4-zb64 zygo-4.1.4-zb64
authorZygo Blaxell <zblaxell@serenity.furryterror.org>
Tue, 4 Aug 2015 03:54:00 +0000 (23:54 -0400)
committerZygo Blaxell <zblaxell@serenity.furryterror.org>
Tue, 4 Aug 2015 03:54:00 +0000 (23:54 -0400)
This is the 4.1.4 stable release

Conflicts:
fs/btrfs/inode-map.c
fs/btrfs/tree-log.c

1  2 
fs/btrfs/ioctl.c patch | diff1 | diff2 | blob | history

diff --cc fs/btrfs/ioctl.c
Simple merge
Linux kernels and configurations used by Zygo.