Merge branch 'master' into for-upstream

[linux-2.6-omap-h63xx.git] / arch / um / drivers / null.c

diff --git a/arch/um/drivers/null.c b/arch/um/drivers/null.c
index 21ad3d7932b350605a3294f9b5b5705a7a49c7ac..2b45a1446c86b5bf34f01cfe9d71d19ec1a118cc 100644 (file)
--- a/arch/um/drivers/null.c
+++ b/arch/um/drivers/null.c
@@ -9,7 +9,7 @@
 #include "chan_user.h"
 #include "os.h"
 
-/* This address is used only as a unique identifer */
+/* This address is used only as a unique identifier */
 static int null_chan;
 
 static void *null_init(char *str, int device, const struct chan_opts *opts)