diff options
| author | David S. Miller <davem@davemloft.net> | 2013-08-31 22:24:24 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-08-31 22:24:24 -0400 |
| commit | ae5dbf1ad83cb90921a400d15fb18afae66e1e56 (patch) | |
| tree | 92492ce47c6caf7851c2a6e5abda31286fc2421b /drivers/net/ethernet/sfc/nic.c | |
| parent | 34aedd3f3b289edba118e66450e95790ccab5091 (diff) | |
| parent | f7a6d2c4427790cc8695401576dc594fcce8fc80 (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next
Ben Hutchings says:
====================
1. A little more refactoring.
2. Remove the unnecessary use of atomic_t that you pointed out.
3. Add support for starting or queueing firmware requests from atomic
context.
4. Add hwmon support for additional sensors found on some new boards.
5. Add support for the EF10 controller architecture, the SFC9100 family
and specifically the SFC9120 controller.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/sfc/nic.c')
| -rw-r--r-- | drivers/net/ethernet/sfc/nic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/sfc/nic.c b/drivers/net/ethernet/sfc/nic.c index 78d413312052..e7dbd2dd202e 100644 --- a/drivers/net/ethernet/sfc/nic.c +++ b/drivers/net/ethernet/sfc/nic.c @@ -1,7 +1,7 @@ /**************************************************************************** - * Driver for Solarflare Solarstorm network controllers and boards + * Driver for Solarflare network controllers and boards * Copyright 2005-2006 Fen Systems Ltd. - * Copyright 2006-2011 Solarflare Communications Inc. + * Copyright 2006-2013 Solarflare Communications Inc. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published |