Merge remote-tracking branch 'ext4/dev'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 4 Nov 2015 23:54:03 +0000 (10:54 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 4 Nov 2015 23:54:03 +0000 (10:54 +1100)
1  2 
fs/ext4/readpage.c

Simple merge