Skip to content
Commit 95bc156c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 2ad53110 d52104b2
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment