Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc...
authorDavid S. Miller <davem@davemloft.net>
Sun, 1 Sep 2013 02:24:24 +0000 (22:24 -0400)
committerDavid S. Miller <davem@davemloft.net>
Sun, 1 Sep 2013 02:24:24 +0000 (22:24 -0400)
commitae5dbf1ad83cb90921a400d15fb18afae66e1e56
tree92492ce47c6caf7851c2a6e5abda31286fc2421b
parent34aedd3f3b289edba118e66450e95790ccab5091
parentf7a6d2c4427790cc8695401576dc594fcce8fc80
Merge branch 'for-davem' of git://git./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>
drivers/net/ethernet/sfc/nic.c