From: Chris Mason <clm@fb.com>
Date: Mon, 11 Jan 2016 14:08:37 +0000 (-0800)
Subject: Merge branch 'misc-cleanups-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b28cf57246d5b797ba725bb033110c247f2c301f;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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

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

b28cf57246d5b797ba725bb033110c247f2c301f
diff --cc fs/btrfs/tests/extent-io-tests.c
index 71ab575e7633,6ec2bce015dc..e29fa297e053
--- a/fs/btrfs/tests/extent-io-tests.c
+++ b/fs/btrfs/tests/extent-io-tests.c
@@@ -18,7 -18,7 +18,8 @@@
  
  #include <linux/pagemap.h>
  #include <linux/sched.h>
 +#include <linux/slab.h>
+ #include <linux/sizes.h>
  #include "btrfs-tests.h"
  #include "../extent_io.h"