]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'nvdimm/libnvdimm-for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 2 Nov 2015 03:23:28 +0000 (14:23 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 2 Nov 2015 03:23:28 +0000 (14:23 +1100)
1  2 
arch/x86/mm/init.c
arch/x86/mm/init_64.c

Simple merge
Simple merge