diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-10-27 00:46:20 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-10-27 00:46:20 -0400 |
| commit | 6ad390a25a9d1d8606b9b826878f0a30639dc2b3 (patch) | |
| tree | 05aff14f02776bc0d59a1f777cb92df6f4456ba9 /drivers/ssb/driver_chipcommon.c | |
| parent | d6069dae4700cf5290a75002c46b9be8ea7eef3c (diff) | |
| parent | 3f48e7354358519e5b93f7f755ec270b3f8eafa0 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/ssb/driver_chipcommon.c')
| -rw-r--r-- | drivers/ssb/driver_chipcommon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ssb/driver_chipcommon.c b/drivers/ssb/driver_chipcommon.c index 06d15b6f2215..5d9c97c24797 100644 --- a/drivers/ssb/driver_chipcommon.c +++ b/drivers/ssb/driver_chipcommon.c | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | * Broadcom ChipCommon core driver | 3 | * Broadcom ChipCommon core driver |
| 4 | * | 4 | * |
| 5 | * Copyright 2005, Broadcom Corporation | 5 | * Copyright 2005, Broadcom Corporation |
| 6 | * Copyright 2006, 2007, Michael Buesch <mb@bu3sch.de> | 6 | * Copyright 2006, 2007, Michael Buesch <m@bues.ch> |
| 7 | * | 7 | * |
| 8 | * Licensed under the GNU/GPL. See COPYING for details. | 8 | * Licensed under the GNU/GPL. See COPYING for details. |
| 9 | */ | 9 | */ |