From: Tejun Heo <tj@kernel.org>
Date: Fri, 3 Jul 2009 22:13:18 +0000 (+0900)
Subject: Merge branch 'master' into for-next
X-Git-Tag: v2.6.32-rc1~676^2^2~35
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c43768cbb7655ea5ff782ae250f6e2ef4297cf98;p=pandora-kernel.git

Merge branch 'master' into for-next

Pull linus#master to merge PER_CPU_DEF_ATTRIBUTES and alpha build fix
changes.  As alpha in percpu tree uses 'weak' attribute instead of
inline assembly, there's no need for __used attribute.

Conflicts:
	arch/alpha/include/asm/percpu.h
	arch/mn10300/kernel/vmlinux.lds.S
	include/linux/percpu-defs.h
---

c43768cbb7655ea5ff782ae250f6e2ef4297cf98
Reading git-diff-tree failed