]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'quilt/hexagon'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Nov 2011 02:30:42 +0000 (13:30 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Nov 2011 02:30:42 +0000 (13:30 +1100)
commite67624e1f8a2af67a064fb9bd2ec2d7398ef1a52
tree243706be01d63dd78e7e822eeed9e51da926872e
parent15eda511524c12f4b5bcc613927a2922901145cb
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