mirror of
https://github.com/torvalds/linux.git
synced 2024-11-14 08:02:07 +00:00
c43768cbb7
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 |
||
---|---|---|
.. | ||
blackfin_sram.h | ||
init.c | ||
isram-driver.c | ||
Makefile | ||
sram-alloc.c |