diff options
author | Dave Airlie <airlied@redhat.com> | 2010-03-31 06:55:14 +0200 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-03-31 06:55:14 +0200 |
commit | 3595be778d8cb887f0e0575ef0a0c1a094d120bb (patch) | |
tree | 15671ed8bd3597d2efe13aa57b755c66014acb57 /drivers/net/netxen/netxen_nic_hw.h | |
parent | drm/radeon/kms: disable MSI on IGP chips (diff) | |
parent | Linux 2.6.34-rc2 (diff) | |
download | linux-3595be778d8cb887f0e0575ef0a0c1a094d120bb.tar.xz linux-3595be778d8cb887f0e0575ef0a0c1a094d120bb.zip |
Merge branch 'v2.6.34-rc2' into drm-linus
Diffstat (limited to 'drivers/net/netxen/netxen_nic_hw.h')
-rw-r--r-- | drivers/net/netxen/netxen_nic_hw.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/netxen/netxen_nic_hw.h b/drivers/net/netxen/netxen_nic_hw.h index 3fd1dcb3583a..e2c5b6f2df03 100644 --- a/drivers/net/netxen/netxen_nic_hw.h +++ b/drivers/net/netxen/netxen_nic_hw.h @@ -19,7 +19,7 @@ * MA 02111-1307, USA. * * The full GNU General Public License is included in this distribution - * in the file called LICENSE. + * in the file called "COPYING". * */ |