From: Chris Mason <chris.mason@oracle.com>
Date: Thu, 29 Jan 2009 01:29:43 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs... 
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=e4f722fa42537bcb0ff14322a57dc3870d093cab;p=linux-2.6-omap-h63xx.git

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

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

e4f722fa42537bcb0ff14322a57dc3870d093cab
diff --cc fs/btrfs/super.c
index db9fb3bc1e3,4c0b7569ba5..f3fd7e2cbc3
--- a/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"