diff options
| author | David S. Miller <davem@davemloft.net> | 2012-02-04 16:42:19 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-02-04 16:42:19 -0500 |
| commit | d07d4c239bbf428db5581ccd5ca3770bbd15bfbd (patch) | |
| tree | 969df78fbbc76b9ff1289e154b641a06f983569b /drivers/net/can/pch_can.c | |
| parent | dd48dc34fe7639a8b2e22d8b609672f5f81aa7cb (diff) | |
| parent | aabdfd6adb804d0aaba0188ade0f1afe42a52e31 (diff) | |
Merge branch 'master' of git://gitorious.org/linux-can/linux-can-next
Conflicts:
drivers/net/can/usb/ems_usb.c
Minor dev_warn --> netdev_warn conversion conflicts.
Diffstat (limited to 'drivers/net/can/pch_can.c')
| -rw-r--r-- | drivers/net/can/pch_can.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c index 6edc25e0dd15..2bb215e00eb1 100644 --- a/drivers/net/can/pch_can.c +++ b/drivers/net/can/pch_can.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (C) 1999 - 2010 Intel Corporation. | 2 | * Copyright (C) 1999 - 2010 Intel Corporation. |
| 3 | * Copyright (C) 2010 OKI SEMICONDUCTOR CO., LTD. | 3 | * Copyright (C) 2010 LAPIS SEMICONDUCTOR CO., LTD. |
| 4 | * | 4 | * |
| 5 | * This program is free software; you can redistribute it and/or modify | 5 | * This program is free software; you can redistribute it and/or modify |
| 6 | * it under the terms of the GNU General Public License as published by | 6 | * it under the terms of the GNU General Public License as published by |