diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-04-04 08:41:29 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-04-04 08:41:29 -0400 |
commit | c16226a1c75042bfdc50bd2921d5919f6267ba51 (patch) | |
tree | f7f6081aab45d598fa44b9e588722ed38c299b8e /drivers/serial/jsm/jsm_neo.c | |
parent | af64371ada9452632c349563d688d30d94e918ba (diff) | |
parent | 6246b6128bbe34d0752f119cf7c5111c85fe481d (diff) |
Merge branch 'master'
Diffstat (limited to 'drivers/serial/jsm/jsm_neo.c')
-rw-r--r-- | drivers/serial/jsm/jsm_neo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/jsm/jsm_neo.c b/drivers/serial/jsm/jsm_neo.c index 87e4e2cf8ce..a5fc589d6ef 100644 --- a/drivers/serial/jsm/jsm_neo.c +++ b/drivers/serial/jsm/jsm_neo.c @@ -20,7 +20,7 @@ * * Contact Information: * Scott H Kilau <Scott_Kilau@digi.com> - * Wendy Xiong <wendyx@us.ltcfwd.linux.ibm.com> + * Wendy Xiong <wendyx@us.ibm.com> * ***********************************************************************/ #include <linux/delay.h> /* For udelay */ |