Merge commit 'v2.6.27-rc1' into x86/urgent

[linux-2.6] / drivers / input / keyboard / aaed2000_kbd.c

diff --git a/drivers/input/keyboard/aaed2000_kbd.c b/drivers/input/keyboard/aaed2000_kbd.c
index a293e8b3f508a4ef2303bbe5a03391bc8a3694e2..8a77bfcd05bc35f9e58a53242788652d95b2c38e 100644 (file)
--- a/drivers/input/keyboard/aaed2000_kbd.c
+++ b/drivers/input/keyboard/aaed2000_kbd.c
@@ -183,4 +183,4 @@ module_exit(aaedkbd_exit);
 
 MODULE_AUTHOR("Nicolas Bellido Y Ortega");
 MODULE_DESCRIPTION("AAED-2000 Keyboard Driver");
-MODULE_LICENSE("GPLv2");
+MODULE_LICENSE("GPL v2");