2 Commits

Author	SHA1	Message	Date
Arnd Bergmann	5b02ee3d21	asm-generic: merge branch 'master' of torvalds/linux-2.6 ... Fixes a merge conflict against the x86 tree caused by a fix to atomic.h which I renamed to atomic_long.h. Signed-off-by: Arnd Bergmann <arnd@arndb.de>	2009-06-12 11:32:58 +02:00
Arnd Bergmann	72099ed271	asm-generic: rename atomic.h to atomic-long.h ... The existing asm-generic/atomic.h only defines the atomic_long type. This renames it to atomic-long.h so we have a place to add a truly generic atomic.h that can be used on all non-SMP systems. Signed-off-by: Remis Lima Baima <remis.developer@googlemail.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Ingo Molnar <mingo@elte.hu>	2009-06-11 21:02:17 +02:00