diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-08 10:47:46 +0000 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-08 10:47:46 +0000 |
commit | 41966710ab574f1fcedf3e10e1ceef911c096d1d (patch) | |
tree | a370f9fb2392267d1e7b06d7c9f43c6d80eb12be /include/linux/can/netlink.h | |
parent | 4633fa48fb41dc6d6f0cd83d7f6b7e262820e7cb (diff) | |
parent | 1dd6c0770d7d4ca477a1a8452ab0161b1150e4ad (diff) |
Merge branch 'for-3.2' into for-3.3
Diffstat (limited to 'include/linux/can/netlink.h')
-rw-r--r-- | include/linux/can/netlink.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/can/netlink.h b/include/linux/can/netlink.h index 34542d374dd..14966ddb7df 100644 --- a/include/linux/can/netlink.h +++ b/include/linux/can/netlink.h @@ -5,8 +5,6 @@ * * Copyright (c) 2009 Wolfgang Grandegger <wg@grandegger.com> * - * Send feedback to <socketcan-users@lists.berlios.de> - * */ #ifndef CAN_NETLINK_H |