git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1a8dd30 746a99a)
Merge branch 'master' into for-next
authorTejun Heo <tj@kernel.org>
Fri, 3 Jul 2009 22:13:18 +0000 (07:13 +0900)
committerTejun Heo <tj@kernel.org>
Fri, 3 Jul 2009 22:13:18 +0000 (07:13 +0900)
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


Trivial merge
Pandora Kernel Repository