diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-02-24 13:23:23 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-02-24 13:23:23 +0900 |
| commit | 35eb304b5cd7b49d581bda79218b8134f3b689ea (patch) | |
| tree | 3d75d9ada70814161d035b2f9166fee05d257dfb /drivers/net/ethernet/intel/igb/e1000_phy.h | |
| parent | ca0cc30109241f280eb871794620d7cf198bb582 (diff) | |
| parent | bb4c7e9a9908548b458f34afb2fee74dc0d49f90 (diff) | |
| download | linux-35eb304b5cd7b49d581bda79218b8134f3b689ea.tar.gz linux-35eb304b5cd7b49d581bda79218b8134f3b689ea.tar.bz2 linux-35eb304b5cd7b49d581bda79218b8134f3b689ea.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-fixes-for-linus
Diffstat (limited to 'drivers/net/ethernet/intel/igb/e1000_phy.h')
| -rw-r--r-- | drivers/net/ethernet/intel/igb/e1000_phy.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/igb/e1000_phy.h b/drivers/net/ethernet/intel/igb/e1000_phy.h index 8510797b9d81..4c32ac66ff39 100644 --- a/drivers/net/ethernet/intel/igb/e1000_phy.h +++ b/drivers/net/ethernet/intel/igb/e1000_phy.h @@ -1,7 +1,7 @@ /******************************************************************************* Intel(R) Gigabit Ethernet Linux driver - Copyright(c) 2007-2011 Intel Corporation. + Copyright(c) 2007-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, |