| commit | c43768cbb7655ea5ff782ae250f6e2ef4297cf98 | [log] [tgz] |
|---|---|---|
| author | Tejun Heo <tj@kernel.org> | Sat Jul 04 07:13:18 2009 +0900 |
| committer | Tejun Heo <tj@kernel.org> | Sat Jul 04 07:13:18 2009 +0900 |
| tree | 3982e41dde3eecaa3739a5d1a8ed18d04bd74f01 | |
| parent | 1a8dd307cc0a2119be4e578c517795464e6dabba [diff] | |
| parent | 746a99a5af60ee676afa2ba469ccd1373493c7e7 [diff] |
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