|author||Jiri Kosina <email@example.com>||2011-04-26 10:22:15 +0200|
|committer||Jiri Kosina <firstname.lastname@example.org>||2011-04-26 10:22:59 +0200|
Merge branch 'master' into for-next
Fast-forwarded to current state of Linus' tree as there are patches to be applied for files that didn't exist on the old branch.
Diffstat (limited to 'arch/s390/include/asm/atomic.h')
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/include/asm/atomic.h b/arch/s390/include/asm/atomic.h
index 5c5ba10384c..d9db13810d1 100644
@@ -9,7 +9,7 @@
* Atomic operations that C can't guarantee us.
* Useful for resource counting etc.
- * s390 uses 'Compare And Swap' for atomicity in SMP enviroment.
+ * s390 uses 'Compare And Swap' for atomicity in SMP environment.