diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 16:33:14 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 16:33:14 -0400 |
| commit | da206c9e68cb93fcab43592d46276c02889c1250 (patch) | |
| tree | 21264cc26fa0322d668b398808f10bd93558d25f /drivers/parport/parport_gsc.h | |
| parent | 916d15445f4ad2a9018e5451760734f36083be77 (diff) | |
| parent | 2e2d0dcc1bd7ca7c26ea5e29efb7f34bbd564f1c (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
typo fixes
Clean up 'inline is not at beginning' warnings for usb storage
Storage class should be first
i386: Trivial typo fixes
ixj: make ixj_set_tone_off() static
spelling fixes
fix paniced->panicked typos
Spelling fixes for Documentation/atomic_ops.txt
move acknowledgment for Mark Adler to CREDITS
remove the bouncing email address of David Campbell
Diffstat (limited to 'drivers/parport/parport_gsc.h')
| -rw-r--r-- | drivers/parport/parport_gsc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/parport/parport_gsc.h b/drivers/parport/parport_gsc.h index 662f6c1fee5d..fc9c37c54022 100644 --- a/drivers/parport/parport_gsc.h +++ b/drivers/parport/parport_gsc.h | |||
| @@ -24,7 +24,7 @@ | |||
| 24 | * Phil Blundell <Philip.Blundell@pobox.com> | 24 | * Phil Blundell <Philip.Blundell@pobox.com> |
| 25 | * Tim Waugh <tim@cyberelk.demon.co.uk> | 25 | * Tim Waugh <tim@cyberelk.demon.co.uk> |
| 26 | * Jose Renau <renau@acm.org> | 26 | * Jose Renau <renau@acm.org> |
| 27 | * David Campbell <campbell@torque.net> | 27 | * David Campbell |
| 28 | * Andrea Arcangeli | 28 | * Andrea Arcangeli |
| 29 | */ | 29 | */ |
| 30 | 30 | ||