From: Zygo Blaxell <zblaxell@serenity.furryterror.org>
Date: Sat, 16 Jan 2016 03:59:48 +0000 (-0500)
Subject: Merge tag 'v4.2.8' into zygo-4.2.8-zb64
X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48a48c8088a93c8e17ba68da47fe359a8f524b84;p=linux

Merge tag 'v4.2.8' into zygo-4.2.8-zb64

This is the 4.2.8 stable release

Conflicts:
	fs/btrfs/ioctl.c
---

48a48c8088a93c8e17ba68da47fe359a8f524b84