]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'quilt/hexagon'
authorStephen Rothwell <sfr@canb.auug.org.au>
Sun, 6 Nov 2011 23:50:13 +0000 (10:50 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Sun, 6 Nov 2011 23:50:13 +0000 (10:50 +1100)
commitc6a7c86272e60f6b5de03ca1b2633e451e18e589
treea128c86774bfa2f1169703d6a165a2cf2e2f009b
parent9ea1891420a280fcb5c896dcca79f84915778f85
parent8e116d15138e0f5bfaea9c76d04751c2149eb746
Merge branch 'quilt/hexagon'

Conflicts:
arch/hexagon/Makefile
arch/hexagon/include/asm/Kbuild
arch/hexagon/include/asm/timex.h
arch/hexagon/include/asm/vdso.h
arch/hexagon/kernel/Makefile
arch/hexagon/kernel/head.S
arch/hexagon/kernel/hexagon_ksyms.c
arch/hexagon/kernel/kgdb.c
arch/hexagon/kernel/vdso.c
arch/hexagon/kernel/vm_vectors.S
arch/hexagon/kernel/vmlinux.lds.S
arch/hexagon/lib/memset.S
arch/hexagon/mm/Makefile
arch/hexagon/mm/pgalloc.c
arch/hexagon/mm/strnlen_user.S