]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'parisc-hd/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 16 May 2014 00:26:42 +0000 (10:26 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 16 May 2014 00:26:42 +0000 (10:26 +1000)
1  2 
arch/parisc/Kconfig
arch/parisc/mm/fault.c

Simple merge
Simple merge