]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'ocfs2/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 2 Nov 2011 01:05:33 +0000 (12:05 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 2 Nov 2011 01:05:33 +0000 (12:05 +1100)
Conflicts:
fs/ocfs2/xattr.c

1  2 
fs/ocfs2/file.c
fs/ocfs2/move_extents.c

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