]> git.hungrycats.org Git - linux/commit
Merge tag 'v4.2.8' into zygo-4.2.8-zb64
authorZygo Blaxell <zblaxell@serenity.furryterror.org>
Sat, 16 Jan 2016 03:59:48 +0000 (22:59 -0500)
committerZygo Blaxell <zblaxell@serenity.furryterror.org>
Sat, 16 Jan 2016 03:59:48 +0000 (22:59 -0500)
commit48a48c8088a93c8e17ba68da47fe359a8f524b84
tree5761c478340a70f32df74044f7a1febe43af5705
parentb10a0c81e460d4f1e8041675575838600c33f364
parent5f5c1db041b45cb74da1c842e13866afcb33975c
Merge tag 'v4.2.8' into zygo-4.2.8-zb64

This is the 4.2.8 stable release

Conflicts:
fs/btrfs/ioctl.c
fs/btrfs/ctree.h
fs/btrfs/extent-tree.c
fs/btrfs/file.c
fs/btrfs/inode.c
fs/btrfs/tree-log.c