Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs...
Chris Mason [Thu, 29 Jan 2009 01:29:43 +0000 (20:29 -0500)]
Fix fs/btrfs/super.c conflict around #includes

1  2 
MAINTAINERS
fs/btrfs/super.c

diff --cc MAINTAINERS
Simple merge
@@@ -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"