Merge remote-tracking branch 'nvdimm/libnvdimm-for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 04:33:45 +0000 (15:33 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 04:33:45 +0000 (15:33 +1100)
1  2 
arch/x86/mm/init.c
arch/x86/mm/init_64.c
kernel/memremap.c

Simple merge
Simple merge
Simple merge