diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
| commit | da733563be5a9da26fe81d9f007262d00b846e22 (patch) | |
| tree | db28291df94a2043af2123911984c5c173da4e6f /net/can/raw.c | |
| parent | 6ccbcf2cb41131f8d56ef0723bf3f7c1f8486076 (diff) | |
| parent | dab78d7924598ea4031663dd10db814e2e324928 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'net/can/raw.c')
| -rw-r--r-- | net/can/raw.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/can/raw.c b/net/can/raw.c index dea99a6e596c..cde1b4a20f75 100644 --- a/net/can/raw.c +++ b/net/can/raw.c | |||
| @@ -37,8 +37,6 @@ | |||
| 37 | * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH | 37 | * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH |
| 38 | * DAMAGE. | 38 | * DAMAGE. |
| 39 | * | 39 | * |
| 40 | * Send feedback to <socketcan-users@lists.berlios.de> | ||
| 41 | * | ||
| 42 | */ | 40 | */ |
| 43 | 41 | ||
| 44 | #include <linux/module.h> | 42 | #include <linux/module.h> |