From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 14 Oct 2011 04:59:11 +0000 (+1200)
Subject: Merge branch 'stable' of git://github.com/cmetcalf-tilera/linux-tile
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=95bc156c62a57cda1b225e03ae23eb2764ee1046;p=~shefty%2Frdma-dev.git

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
---

95bc156c62a57cda1b225e03ae23eb2764ee1046