From: Chris Mason <clm@fb.com>
Date: Sat, 4 Oct 2014 16:56:45 +0000 (-0700)
Subject: Merge branch 'cleanup/misc-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: fixes-against-v3.18-rc2~120^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bbf65cf0b5b67843ca094df01019222b85af2183;p=pandora-kernel.git

Merge branch 'cleanup/misc-for-3.18' of git://git./linux/kernel/git/kdave/linux into for-linus

Signed-off-by: Chris Mason <clm@fb.com>

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

bbf65cf0b5b67843ca094df01019222b85af2183
Reading git-diff-tree failed