diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-22 17:12:37 +1000 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-22 17:12:37 +1000 |
commit | 8725f25acc656c1522d48a6746055099efdaca4c (patch) | |
tree | e241424fa58178ed6c2a95a4eb931ea83dbea33c /drivers/net/ixgb/Makefile | |
parent | c69cccc95fe4b90dde5fe33e6a3b77880b534fa4 (diff) | |
parent | 93ded9b8fd42abe2c3607097963d8de6ad9117eb (diff) | |
download | kernel_samsung_espresso10-8725f25acc656c1522d48a6746055099efdaca4c.zip kernel_samsung_espresso10-8725f25acc656c1522d48a6746055099efdaca4c.tar.gz kernel_samsung_espresso10-8725f25acc656c1522d48a6746055099efdaca4c.tar.bz2 |
Merge commit 'origin/master'
Manually fixed up:
drivers/net/fs_enet/fs_enet-main.c
Diffstat (limited to 'drivers/net/ixgb/Makefile')
-rw-r--r-- | drivers/net/ixgb/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ixgb/Makefile b/drivers/net/ixgb/Makefile index 838a508..0b20c5e 100644 --- a/drivers/net/ixgb/Makefile +++ b/drivers/net/ixgb/Makefile @@ -1,7 +1,7 @@ ################################################################################ # # Intel PRO/10GbE Linux driver -# Copyright(c) 1999 - 2006 Intel Corporation. +# Copyright(c) 1999 - 2008 Intel Corporation. # # This program is free software; you can redistribute it and/or modify it # under the terms and conditions of the GNU General Public License, |