From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 8 Nov 2011 23:55:03 +0000 (+1100)
Subject: Merge branch 'quilt/hexagon'
X-Git-Tag: next-20111109~58
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1f102228519a44a51a34ce9722e5dcf8f95a0ac1;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
---

1f102228519a44a51a34ce9722e5dcf8f95a0ac1