Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs...

Fix fs/btrfs/super.c conflict around #includes

diff --cc MAINTAINERS
Simple merge

diff --cc fs/btrfs/super.c
index db9fb3b,4c0b756..f3fd7e2
--- 1/fs/btrfs/super.c
--- 2/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@@ -37,8 -37,6 +37,7 @@@
  #include <linux/ctype.h>
  #include <linux/namei.h>
  #include <linux/miscdevice.h>
- #include <linux/version.h>
 +#include <linux/magic.h>
  #include "compat.h"
  #include "ctree.h"
  #include "disk-io.h"