Merge branch 'master' into for-next
authorJiri Kosina <jkosina@suse.cz>
Mon, 18 Apr 2016 09:18:55 +0000 (11:18 +0200)
committerJiri Kosina <jkosina@suse.cz>
Mon, 18 Apr 2016 09:18:55 +0000 (11:18 +0200)
commit9938b04472d5c59f8bd8152a548533a8599596a2
tree0fc8318100878c5e446076613ec02a97aa179119
parentbd7ced98812dbb906950d8b0ec786f14f631cede
parentc3b46c73264b03000d1e18b22f5caf63332547c9
Merge branch 'master' into for-next

Sync with Linus' tree so that patches against newer codebase can be applied.

Signed-off-by: Jiri Kosina <jkosina@suse.cz>
fs/jbd2/recovery.c
fs/jbd2/transaction.c
fs/super.c