[Kdfs-commits] [kernel]kdfs branch, make_kdfs_compile, updated. aac7aa4efd9eccdfbeaa04c04db7928e8b439110

[Marko O. <d0...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "kdfs".

The branch, make_kdfs_compile has been updated
       via  aac7aa4efd9eccdfbeaa04c04db7928e8b439110 (commit)
      from  159422433e1cbebdd6b3df6edc5e63a77eb17941 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit aac7aa4efd9eccdfbeaa04c04db7928e8b439110
Author: Marko Obrovac <mar...@in...>
Date:   Mon Jan 11 16:04:24 2010 +0000

    Forgot to remove a conflict line marker

diff --git a/fs/kdfs/debug_kdfs.h b/fs/kdfs/debug_kdfs.h
index bfc8446..3636fc6 100644
--- a/fs/kdfs/debug_kdfs.h
+++ b/fs/kdfs/debug_kdfs.h
@@ -44,7 +44,6 @@ do { \
       /*pr_debug*/printk("%s - (%s) - %d : ", KDFS_PART, __PRETTY_FUNCTION__, \
               current->pid) ; \
       /*pr_debug*/printk(format, ## args) ; \
->>>>>>> e9b2900ac5dcea18ed708cf4688628437606aacd
     } \
 	if(level == DBG_PANIC)\
 		BUG();\

-----------------------------------------------------------------------

Summary of changes:
 fs/kdfs/debug_kdfs.h |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
kdfs