Merge branch 'reiserfs-updates' from Jeff Mahoney