Merge branch 'discontig-bg' of git://oss.oracle.com/git/tma/linux-2.6 into ocfs2...

diff --cc fs/ocfs2/alloc.c
Simple merge

diff --cc fs/ocfs2/alloc.h
Simple merge

diff --cc fs/ocfs2/dir.c
Simple merge

diff --cc fs/ocfs2/namei.c
Simple merge

diff --cc fs/ocfs2/refcounttree.c
Simple merge

diff --cc fs/ocfs2/super.c
Simple merge