From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 3 Nov 2011 02:30:42 +0000 (+1100)
Subject: Merge branch 'quilt/hexagon'
X-Git-Tag: next-20111103~70
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e67624e1f8a2af67a064fb9bd2ec2d7398ef1a52;p=karo-tx-linux.git

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
---

e67624e1f8a2af67a064fb9bd2ec2d7398ef1a52