]> git.hungrycats.org Git - linux/commitdiff
projects / linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7a35188 be4cb23)
Merge tag 'v4.0.5' into zygo-4.0.5-zb64
authorZygo Blaxell <zblaxell@thirteen.furryterror.org>
Sat, 6 Jun 2015 22:27:51 +0000 (18:27 -0400)
committerZygo Blaxell <zblaxell@thirteen.furryterror.org>
Sat, 6 Jun 2015 22:27:51 +0000 (18:27 -0400)
This is the 4.0.5 stable release

Conflicts:
fs/btrfs/extent-tree.c

1  2 
fs/btrfs/extent-tree.c patch | diff1 | diff2 | blob | history
fs/btrfs/volumes.c patch | diff1 | diff2 | blob | history

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