Merge branch 'stable' of git://github.com/cmetcalf-tilera/linux-tile
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 Oct 2011 04:59:11 +0000 (16:59 +1200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 Oct 2011 04:59:11 +0000 (16:59 +1200)
* 'stable' of git://github.com/cmetcalf-tilera/linux-tile:
  tile: revert change from <asm/atomic.h> to <linux/atomic.h> in asm files


Trivial merge