diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2010-02-26 20:04:15 +0100 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-02-26 20:06:24 +0100 |
| commit | a7790532f5b7358c33a6b1834dc2b318de209f31 (patch) | |
| tree | 0ceb9e24b3f54cb5c8453fb5a218e2a94a0f1cce /drivers/net/ixgbe/ixgbe_82599.c | |
| parent | mtd: nand: Add SmartMedia device table to sm_common module (diff) | |
| parent | Linux 2.6.33 (diff) | |
| download | linux-a7790532f5b7358c33a6b1834dc2b318de209f31.tar.xz linux-a7790532f5b7358c33a6b1834dc2b318de209f31.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
The SmartMedia FTL code depends on new kfifo bits from 2.6.33
Diffstat (limited to 'drivers/net/ixgbe/ixgbe_82599.c')
| -rw-r--r-- | drivers/net/ixgbe/ixgbe_82599.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ixgbe/ixgbe_82599.c b/drivers/net/ixgbe/ixgbe_82599.c index 538340527aa6..b49bd6b9feb7 100644 --- a/drivers/net/ixgbe/ixgbe_82599.c +++ b/drivers/net/ixgbe/ixgbe_82599.c @@ -1,7 +1,7 @@ /******************************************************************************* Intel 10 Gigabit PCI Express Linux driver - Copyright(c) 1999 - 2009 Intel Corporation. + Copyright(c) 1999 - 2010 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, |