Tejun Heo c43768cbb7 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		2009-07-04 07:13:18 +09:00
..
include	[IA64-SGI] Older PROM WAR for device flush code	2006-01-17 10:08:37 -08:00
kernel	Merge branch 'master' into for-next	2009-07-04 07:13:18 +09:00
pci	Pull for-2.6.31 into release	2009-06-17 09:35:24 -07:00
Makefile	[IA64-SGI] Recursive flags do not work for selective builds	2006-01-26 13:17:34 -08:00