diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:15:58 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:15:58 -0400 |
| commit | e765ee90da62535ac7d7a97f2464f9646539d683 (patch) | |
| tree | 7a9cecce5aab958938e9a3bf46c2302d6af1958c /drivers/cdrom/viocd.c | |
| parent | a4500b84c51645bbc86be3ca84f2252b7ada060f (diff) | |
| parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) | |
Merge branch 'linus' into tracing/ftrace
Diffstat (limited to 'drivers/cdrom/viocd.c')
| -rw-r--r-- | drivers/cdrom/viocd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cdrom/viocd.c b/drivers/cdrom/viocd.c index 5245a4a0ba74..9d0dfe6e0d63 100644 --- a/drivers/cdrom/viocd.c +++ b/drivers/cdrom/viocd.c | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | * Authors: Dave Boutcher <boutcher@us.ibm.com> | 6 | * Authors: Dave Boutcher <boutcher@us.ibm.com> |
| 7 | * Ryan Arnold <ryanarn@us.ibm.com> | 7 | * Ryan Arnold <ryanarn@us.ibm.com> |
| 8 | * Colin Devilbiss <devilbis@us.ibm.com> | 8 | * Colin Devilbiss <devilbis@us.ibm.com> |
| 9 | * Stephen Rothwell <sfr@au1.ibm.com> | 9 | * Stephen Rothwell |
| 10 | * | 10 | * |
| 11 | * (C) Copyright 2000-2004 IBM Corporation | 11 | * (C) Copyright 2000-2004 IBM Corporation |
| 12 | * | 12 | * |