tree 3982e41dde3eecaa3739a5d1a8ed18d04bd74f01
parent 1a8dd307cc0a2119be4e578c517795464e6dabba
parent 746a99a5af60ee676afa2ba469ccd1373493c7e7
author Tejun Heo <tj@kernel.org> 1246659198 +0900
committer Tejun Heo <tj@kernel.org> 1246659198 +0900

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