diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-02-20 03:35:12 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-02-20 03:35:12 +0100 |
| commit | fa2c8f401797eee814b7b9fa0b23fa6c4c3f5533 (patch) | |
| tree | 826fb23071b866e112d6e9c510fe3ad4d668acdc /drivers/net/ethernet/intel/igbvf/vf.c | |
| parent | ASoC: Add __devinit annotation for pxa2xx_ac97_probe (diff) | |
| parent | Linux 3.3-rc4 (diff) | |
| download | linux-fa2c8f401797eee814b7b9fa0b23fa6c4c3f5533.tar.xz linux-fa2c8f401797eee814b7b9fa0b23fa6c4c3f5533.zip | |
Merge tag 'v3.3-rc4' into for-3.4 in order to resolve the conflict
resolved below within the FSI driver and allow the application of the
dmaeengine conversion that depends on this resolution.
Linux 3.3-rc4
Conflicts:
sound/soc/sh/fsi.c
Diffstat (limited to 'drivers/net/ethernet/intel/igbvf/vf.c')
| -rw-r--r-- | drivers/net/ethernet/intel/igbvf/vf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/igbvf/vf.c b/drivers/net/ethernet/intel/igbvf/vf.c index af3822f9ea9a..19551977b352 100644 --- a/drivers/net/ethernet/intel/igbvf/vf.c +++ b/drivers/net/ethernet/intel/igbvf/vf.c @@ -1,7 +1,7 @@ /******************************************************************************* Intel(R) 82576 Virtual Function Linux driver - Copyright(c) 2009 - 2010 Intel Corporation. + Copyright(c) 2009 - 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, |