]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'ext4/dev'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 29 Jul 2011 02:21:59 +0000 (12:21 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 29 Jul 2011 02:22:03 +0000 (12:22 +1000)
commit0b572fbad2933f4da10e6ce397b1faa6a490bb48
tree01f0dc7080bd54bfdc62355b393e4c44e4bdfd4e
parentaf41a1397bfceb5de8a19aaec62dc37126d3c877
parent349d147c990ddddb5acae63e91fd03ab2f9c8ab6
Merge remote-tracking branch 'ext4/dev'

Conflicts:
fs/ext4/inode.c
fs/ext4/ext4.h
fs/ext4/fsync.c
fs/ext4/indirect.c
fs/ext4/inode.c
fs/ext4/namei.c
include/trace/events/ext4.h