diff options
| author | Colin Cross <ccross@android.com> | 2012-02-21 12:45:05 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2012-02-21 12:45:05 -0800 |
| commit | fbd94b86e411e6ea0b4fa56682120b32af5c16c2 (patch) | |
| tree | 59f59602de610bddfad66e294cb42ee1d1f29d31 /drivers/net/ethernet/intel/ixgbevf/mbx.h | |
| parent | 293f64abe6006f6ff1cc6f672e27729ff7b74ead (diff) | |
| parent | b01543dfe67bb1d191998e90d20534dc354de059 (diff) | |
Merge commit 'v3.3-rc4' into android-3.3
Conflicts:
drivers/mmc/core/sdio.c
drivers/staging/android/Kconfig
drivers/staging/android/lowmemorykiller.c
Change-Id: I39ef9b27bb9febaee811b200ccac0ed5d51147f3
Diffstat (limited to 'drivers/net/ethernet/intel/ixgbevf/mbx.h')
| -rw-r--r-- | drivers/net/ethernet/intel/ixgbevf/mbx.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/ixgbevf/mbx.h b/drivers/net/ethernet/intel/ixgbevf/mbx.h index 9d38a94a348..cf9131c5c11 100644 --- a/drivers/net/ethernet/intel/ixgbevf/mbx.h +++ b/drivers/net/ethernet/intel/ixgbevf/mbx.h @@ -1,7 +1,7 @@ /******************************************************************************* Intel 82599 Virtual Function driver - Copyright(c) 1999 - 2010 Intel Corporation. + Copyright(c) 1999 - 2012 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, |