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 |
||
---|---|---|
.. | ||
boot | ||
include/asm | ||
kernel | ||
lib | ||
mb93090-mb00 | ||
mm | ||
defconfig | ||
Kconfig | ||
Kconfig.debug | ||
Makefile |