From: Paul Mundt <lethal@linux-sh.org>
Date: Tue, 8 Dec 2009 06:47:12 +0000 (+0900)
Subject: Merge branch 'master' into sh/hw-breakpoints
X-Git-Tag: v2.6.34-rc1~285^2~136^3~12
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6424db52e24e8cdf89917fa3c10395116440160e;p=pandora-kernel.git

Merge branch 'master' into sh/hw-breakpoints

Conflict between FPU thread flag migration and debug
thread flag addition.

Conflicts:
	arch/sh/include/asm/thread_info.h
	arch/sh/include/asm/ubc.h
	arch/sh/kernel/process_32.c
---

6424db52e24e8cdf89917fa3c10395116440160e
Reading git-diff-tree failed