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)
commit95bc156c62a57cda1b225e03ae23eb2764ee1046
tree8307f64b3727db3ca51c71d8f0a03e6b024721be
parent2ad53110d654c7c9a80dcea341f4117246c1b6f9
parentd52104b29a3735f2b4dceefcb01b19d370a783ea
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