From 4179ac22d5987b41a89eee531ed9d88fa6d028b9 Mon Sep 17 00:00:00 2001
From: Jim Owens <jowens@hp.com>
Date: Thu, 2 Apr 2009 17:02:55 -0400
Subject: [PATCH] --- yaml --- r: 140338 b: refs/heads/master c:
 2e966ed22c3c56227f8a7322d7b008945352e6ab h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/fs/btrfs/async-thread.c | 1 -
 trunk/fs/btrfs/delayed-ref.c  | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4375f0f80278..f60c765d34af 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 93dbfad7ac647d4f00354893fe93e8a55be114d5
+refs/heads/master: 2e966ed22c3c56227f8a7322d7b008945352e6ab
diff --git a/trunk/fs/btrfs/async-thread.c b/trunk/fs/btrfs/async-thread.c
index cba701dba350..51bfdfc8fcda 100644
--- a/trunk/fs/btrfs/async-thread.c
+++ b/trunk/fs/btrfs/async-thread.c
@@ -20,7 +20,6 @@
 #include <linux/list.h>
 #include <linux/spinlock.h>
 #include <linux/freezer.h>
-#include <linux/ftrace.h>
 #include "async-thread.h"
 
 #define WORK_QUEUED_BIT 0
diff --git a/trunk/fs/btrfs/delayed-ref.c b/trunk/fs/btrfs/delayed-ref.c
index cbf7dc8ae3ec..d6c01c096a40 100644
--- a/trunk/fs/btrfs/delayed-ref.c
+++ b/trunk/fs/btrfs/delayed-ref.c
@@ -18,7 +18,6 @@
 
 #include <linux/sched.h>
 #include <linux/sort.h>
-#include <linux/ftrace.h>
 #include "ctree.h"
 #include "delayed-ref.h"
 #include "transaction.h"