]> www.infradead.org Git - users/willy/linux.git/commitdiff
Merge remote-tracking branch 'ext4/dev'
authorStephen Rothwell <sfr@canb.auug.org.au>
Sun, 9 Dec 2018 23:43:15 +0000 (10:43 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Sun, 9 Dec 2018 23:43:15 +0000 (10:43 +1100)
1  2 
fs/ext4/ext4.h
fs/ext4/super.c

diff --cc fs/ext4/ext4.h
Simple merge
diff --cc fs/ext4/super.c
Simple merge