12 Jun, 2009

2 commits

• 5b02ee3d2   asm-generic: merge branch 'master' of torvalds/linux-2.6 ... Browse Code »

  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 Bergmann

  2009-06-12 17:32:58 +0800  
• 72099ed27   asm-generic: rename atomic.h to atomic-long.h ... Browse Code »

  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
  Signed-off-by: Arnd Bergmann
  Acked-by: Ingo Molnar

  Arnd Bergmann

  2009-06-12 03:02:17 +0800