]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'sparc-next/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 00:01:37 +0000 (10:01 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 00:01:37 +0000 (10:01 +1000)
commit68f6180cfbd523718e1d2c3f161ee3815514d91b
tree671cea0851adf0cba48b8d6b0b90f7d7e842a050
parent085f44b57787ef9bf16f3833651b338d2354fbf4
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