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
..
boot	FRV: Drop 'TOPDIR' from Makefiles	2008-01-28 23:14:37 +01:00
include/asm	FRV: Add basic performance counter support	2009-07-01 19:38:31 -07:00
kernel	Merge branch 'master' into for-next	2009-07-04 07:13:18 +09:00
lib	FRV: Add basic performance counter support	2009-07-01 19:38:31 -07:00
mb93090-mb00	FRV: BUG to BUG_ON changes	2009-06-11 09:01:26 -07:00
mm	Move FAULT_FLAG_xyz into handle_mm_fault() callers	2009-06-21 13:08:22 -07:00
defconfig
Kconfig	FRV: Add basic performance counter support	2009-07-01 19:38:31 -07:00
Kconfig.debug
Makefile	kbuild: enable 'make AFLAGS=...' to add additional options to AS	2007-10-15 21:59:31 +02:00