diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-18 20:11:27 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-18 20:11:27 (GMT) |
| commit | 80ae3fa5d6712ef3625eff617f72e190645d6361 (patch) | |
| tree | fd9be0ecbb4baa6385aa1a75af7ced5f7d691be4 /drivers/net/can/Kconfig | |
| parent | 59db5b2b9e0327e545ff5764dadcb26062c2ab1f (diff) | |
| parent | 85e2efbb1db9a18d218006706d6e4fbeb0216213 (diff) | |
| download | linux-80ae3fa5d6712ef3625eff617f72e190645d6361.tar.xz | |
Merge 2.6.38-rc5 into staging-next
This is to resolve a merge conflict with:
drivers/staging/zram/zram_drv.c
as pointed out by Stephen Rothwell
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Nitin Gupta <ngupta@vflare.org>
Cc: Robert Jennings <rcj@linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/net/can/Kconfig')
| -rw-r--r-- | drivers/net/can/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig index 986195e..5dec456 100644 --- a/drivers/net/can/Kconfig +++ b/drivers/net/can/Kconfig @@ -23,7 +23,7 @@ config CAN_SLCAN As only the sending and receiving of CAN frames is implemented, this driver should work with the (serial/USB) CAN hardware from: - www.canusb.com / www.can232.com / www.mictronic.com / www.canhack.de + www.canusb.com / www.can232.com / www.mictronics.de / www.canhack.de Userspace tools to attach the SLCAN line discipline (slcan_attach, slcand) can be found in the can-utils at the SocketCAN SVN, see |