Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 11 Aug 2010 16:19:43 +0000 (09:19 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 11 Aug 2010 16:19:43 +0000 (09:19 -0700)
* 'for-linus' of git://git.open-osd.org/linux-open-osd:
  exofs: Fix groups code when num_devices is not divisible by group_width
  exofs: Remove useless optimization
  exofs: exofs_file_fsync and exofs_file_flush correctness
  exofs: Remove superfluous dependency on buffer_head and writeback

1  2 
fs/exofs/file.c
fs/exofs/inode.c
fs/exofs/ios.c
fs/exofs/super.c

diff --cc fs/exofs/file.c
Simple merge
Simple merge
diff --cc fs/exofs/ios.c
Simple merge
Simple merge