diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-02 15:58:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-02 15:58:45 -0400 |
| commit | 63589ed0785ffc715777a54ccb96cdfaea9edbc0 (patch) | |
| tree | 8ef3e50b7f87a5a2f5b0d96d1e22a1277c2381c0 /drivers/serial | |
| parent | 24c7cd0630f76f0eb081d539c53893d9f15787e8 (diff) | |
| parent | a580290c3e64bb695158a090d02d1232d9609311 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (48 commits)
Documentation: fix minor kernel-doc warnings
BUG_ON() Conversion in drivers/net/
BUG_ON() Conversion in drivers/s390/net/lcs.c
BUG_ON() Conversion in mm/slab.c
BUG_ON() Conversion in mm/highmem.c
BUG_ON() Conversion in kernel/signal.c
BUG_ON() Conversion in kernel/signal.c
BUG_ON() Conversion in kernel/ptrace.c
BUG_ON() Conversion in ipc/shm.c
BUG_ON() Conversion in fs/freevxfs/
BUG_ON() Conversion in fs/udf/
BUG_ON() Conversion in fs/sysv/
BUG_ON() Conversion in fs/inode.c
BUG_ON() Conversion in fs/fcntl.c
BUG_ON() Conversion in fs/dquot.c
BUG_ON() Conversion in md/raid10.c
BUG_ON() Conversion in md/raid6main.c
BUG_ON() Conversion in md/raid5.c
Fix minor documentation typo
BFP->BPF in Documentation/networking/tuntap.txt
...
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/jsm/jsm.h | 2 | ||||
| -rw-r--r-- | drivers/serial/jsm/jsm_driver.c | 2 | ||||
| -rw-r--r-- | drivers/serial/jsm/jsm_neo.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/serial/jsm/jsm.h b/drivers/serial/jsm/jsm.h index dfc1e86d3aa1..043f50b1d10c 100644 --- a/drivers/serial/jsm/jsm.h +++ b/drivers/serial/jsm/jsm.h | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | * | 20 | * |
| 21 | * Contact Information: | 21 | * Contact Information: |
| 22 | * Scott H Kilau <Scott_Kilau@digi.com> | 22 | * Scott H Kilau <Scott_Kilau@digi.com> |
| 23 | * Wendy Xiong <wendyx@us.ltcfwd.linux.ibm.com> | 23 | * Wendy Xiong <wendyx@us.ibm.com> |
| 24 | * | 24 | * |
| 25 | ***********************************************************************/ | 25 | ***********************************************************************/ |
| 26 | 26 | ||
diff --git a/drivers/serial/jsm/jsm_driver.c b/drivers/serial/jsm/jsm_driver.c index b1b66e71d281..b3e1f71be4da 100644 --- a/drivers/serial/jsm/jsm_driver.c +++ b/drivers/serial/jsm/jsm_driver.c | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | * | 20 | * |
| 21 | * Contact Information: | 21 | * Contact Information: |
| 22 | * Scott H Kilau <Scott_Kilau@digi.com> | 22 | * Scott H Kilau <Scott_Kilau@digi.com> |
| 23 | * Wendy Xiong <wendyx@us.ltcfwd.linux.ibm.com> | 23 | * Wendy Xiong <wendyx@us.ibm.com> |
| 24 | * | 24 | * |
| 25 | * | 25 | * |
| 26 | ***********************************************************************/ | 26 | ***********************************************************************/ |
diff --git a/drivers/serial/jsm/jsm_neo.c b/drivers/serial/jsm/jsm_neo.c index 87e4e2cf8ce7..a5fc589d6ef5 100644 --- a/drivers/serial/jsm/jsm_neo.c +++ b/drivers/serial/jsm/jsm_neo.c | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | * | 20 | * |
| 21 | * Contact Information: | 21 | * Contact Information: |
| 22 | * Scott H Kilau <Scott_Kilau@digi.com> | 22 | * Scott H Kilau <Scott_Kilau@digi.com> |
| 23 | * Wendy Xiong <wendyx@us.ltcfwd.linux.ibm.com> | 23 | * Wendy Xiong <wendyx@us.ibm.com> |
| 24 | * | 24 | * |
| 25 | ***********************************************************************/ | 25 | ***********************************************************************/ |
| 26 | #include <linux/delay.h> /* For udelay */ | 26 | #include <linux/delay.h> /* For udelay */ |