diff options
| author | Frederic Weisbecker <fweisbec@gmail.com> | 2010-08-09 01:49:58 +0200 |
|---|---|---|
| committer | Frederic Weisbecker <fweisbec@gmail.com> | 2010-08-09 02:14:15 +0200 |
| commit | d9a145fb6e5f37b9903dea8371ab5c3e34e8e2d1 (patch) | |
| tree | e2b4bb46fa00f0ad20447e40dba6fb21a4ae0815 /drivers/net/vxge/vxge-ethtool.h | |
| parent | c9243f5bdd6637b2bb7dc254b54d9edf957ef17e (diff) | |
| parent | 45d7f32c7a43cbb9592886d38190e379e2eb2226 (diff) | |
Merge commit 'linus/master' into bkl/core
Merge reason: The staging tree has introduced the easycap
driver lately. We need the latest updates to pushdown the
bkl in its ioctl helper.
Diffstat (limited to 'drivers/net/vxge/vxge-ethtool.h')
| -rw-r--r-- | drivers/net/vxge/vxge-ethtool.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/vxge/vxge-ethtool.h b/drivers/net/vxge/vxge-ethtool.h index 1c3df0a34ac..6cf3044d7f4 100644 --- a/drivers/net/vxge/vxge-ethtool.h +++ b/drivers/net/vxge/vxge-ethtool.h @@ -7,9 +7,9 @@ * system is licensed under the GPL. * See the file COPYING in this distribution for more information. * - * vxge-ethtool.h: Driver for Neterion Inc's X3100 Series 10GbE PCIe I/O + * vxge-ethtool.h: Driver for Exar Corp's X3100 Series 10GbE PCIe I/O * Virtualized Server Adapter. - * Copyright(c) 2002-2009 Neterion Inc. + * Copyright(c) 2002-2010 Exar Corp. ******************************************************************************/ #ifndef _VXGE_ETHTOOL_H #define _VXGE_ETHTOOL_H |