]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'sparc-next/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 May 2014 00:26:50 +0000 (10:26 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 May 2014 00:26:50 +0000 (10:26 +1000)
commitb2d4b47d04241c6579f681508a913fbedef2a219
tree3acc1c169037781f5de5de56993ec4c98a0f8a5b
parent23734e9f99442d74e0f52f32d3558c1ec55716a1
parent311b8935ad4e13bac5880ae3f0c269b0c253d25f
Merge remote-tracking branch 'sparc-next/master'

Conflicts:
arch/sparc/include/asm/pgtable_64.h
arch/sparc/include/asm/pgtable_64.h
arch/sparc/kernel/smp_64.c
arch/sparc/kernel/unaligned_64.c
arch/sparc/mm/fault_64.c
arch/sparc/mm/init_64.c
arch/sparc/mm/tsb.c