diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-14 16:59:11 +1200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-14 16:59:11 +1200 |
commit | 95bc156c62a57cda1b225e03ae23eb2764ee1046 (patch) | |
tree | 8307f64b3727db3ca51c71d8f0a03e6b024721be /crypto/ansi_cprng.c | |
parent | 2ad53110d654c7c9a80dcea341f4117246c1b6f9 (diff) | |
parent | d52104b29a3735f2b4dceefcb01b19d370a783ea (diff) |
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
Diffstat (limited to 'crypto/ansi_cprng.c')
0 files changed, 0 insertions, 0 deletions