diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-14 06:59:11 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-14 06:59:11 +0200 |
commit | 95bc156c62a57cda1b225e03ae23eb2764ee1046 (patch) | |
tree | 8307f64b3727db3ca51c71d8f0a03e6b024721be /kernel/freezer.c | |
parent | Merge branch 'x86-urgent-for-linus' of git://tesla.tglx.de/git/linux-2.6-tip (diff) | |
parent | tile: revert change from <asm/atomic.h> to <linux/atomic.h> in asm files (diff) | |
download | linux-95bc156c62a57cda1b225e03ae23eb2764ee1046.tar.xz linux-95bc156c62a57cda1b225e03ae23eb2764ee1046.zip |
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 'kernel/freezer.c')
0 files changed, 0 insertions, 0 deletions