Merge branch 'linus' into cont_syslog
[safe/jmp/linux-2.6] / ext4 / ext4_jbd2.c