Merge branch 'for-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/jeffm/linux...
authorJan Kara <jack@suse.cz>
Fri, 9 Aug 2013 08:49:58 +0000 (10:49 +0200)
committerJan Kara <jack@suse.cz>
Fri, 9 Aug 2013 08:49:58 +0000 (10:49 +0200)
commit97a2847d064e2fdd2e3cd4ff14cad2f377f0677a
treee49ce105dc6febc25dc3ceba6070ea3998c7330c
parente99a03c6f50a699d63b5751e3e88f84e43b037a7
parentd2d0395fd1778d4bf714adc5bfd23a5d748d7802
Merge branch 'for-3.12' of git://git./linux/kernel/git/jeffm/linux-reiserfs into for_next_testing

Reiserfs locking fixes.