|author||Jiri Kosina <firstname.lastname@example.org>||2011-04-26 10:22:15 +0200|
|committer||Jiri Kosina <email@example.com>||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/m68k/include/asm/gpio.h')
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/gpio.h b/arch/m68k/include/asm/gpio.h
index c64c7b74cf8..b2046839f4b 100644
@@ -31,7 +31,7 @@
* GPIOs in a single control area, others have some GPIOs implemented in
* different modules.
- * This implementation attempts accomodate the differences while presenting
+ * This implementation attempts accommodate the differences while presenting
* a generic interface that will optimize to as few instructions as possible.
#if defined(CONFIG_M5206) || defined(CONFIG_M5206e) || \