tree 8307f64b3727db3ca51c71d8f0a03e6b024721be
parent 2ad53110d654c7c9a80dcea341f4117246c1b6f9
parent d52104b29a3735f2b4dceefcb01b19d370a783ea
author Linus Torvalds <torvalds@linux-foundation.org> 1318568351 +1200
committer Linus Torvalds <torvalds@linux-foundation.org> 1318568351 +1200

Merge branch 'stable' of git://github.com/cmetcalf-tilera/linux-tile

* 'stable' of git://github.com/cmetcalf-tilera/linux-tile:
  tile: revert change from <asm/atomic.h> to <linux/atomic.h> in asm files