]> git.karo-electronics.de Git - mv-sheeva.git/commit - arch/arm/mach-davinci/include/mach/aemif.h
Merge branch 'next' into upstream-merge
authorTheodore Ts'o <tytso@mit.edu>
Thu, 28 Oct 2010 03:44:47 +0000 (23:44 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Thu, 28 Oct 2010 03:44:47 +0000 (23:44 -0400)
commita107e5a3a473a2ea62bd5af24e11b84adf1486ff
treed36c2cb38d8be88d4d75cdebc354aa140aa0e470
parente3e1288e86a07cdeb0aee5860a2dff111c6eff79
parenta269029d0e2192046be4c07ed78a45022469ee4c
Merge branch 'next' into upstream-merge

Conflicts:
fs/ext4/inode.c
fs/ext4/mballoc.c
include/trace/events/ext4.h
15 files changed:
fs/ext4/extents.c
fs/ext4/fsync.c
fs/ext4/ialloc.c
fs/ext4/inode.c
fs/ext4/mballoc.c
fs/ext4/namei.c
fs/ext4/resize.c
fs/ext4/super.c
fs/jbd2/checkpoint.c
fs/jbd2/commit.c
fs/jbd2/journal.c
include/linux/blkdev.h
include/linux/fs.h
include/linux/writeback.h
include/trace/events/ext4.h