]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'quilt/hexagon'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 8 Nov 2011 23:55:03 +0000 (10:55 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 8 Nov 2011 23:55:03 +0000 (10:55 +1100)
commit1f102228519a44a51a34ce9722e5dcf8f95a0ac1
tree25e384d8905191fe0eed86b306b8ca0ce038ce4b
parent503f3df1a4f7b1acee2ad96ffc00e3ebed059625
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