diff options
| author | David S. Miller <davem@davemloft.net> | 2013-08-29 01:56:01 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-08-29 01:56:01 -0400 |
| commit | 4c9d546f6c522f541dfb01e192ab7101eca0053b (patch) | |
| tree | 4def585cba646c5825abbeb9d965a962b3c74b5e /drivers/nfc | |
| parent | cc328deac5a5f576aa79d87cfacf01e370e5e03e (diff) | |
| parent | d4fbdcfe93928fbcb7374ea490e41f7b69d95380 (diff) | |
| download | blackbird-op-linux-4c9d546f6c522f541dfb01e192ab7101eca0053b.tar.gz blackbird-op-linux-4c9d546f6c522f541dfb01e192ab7101eca0053b.zip | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next
Ben Hutchings says:
====================
1. Further cleanup and refactoring in preparation for EF10.
2. Remove ethtool stats that are always zero on Falcon boards.
3. Add an ethtool stat for merged TX completions.
4. Prepare to support merged RX completions.
5. Prepare to support more hwmon sensors.
6. Add support for new events that are generated by EF10 firmware.
7. Update MC reboot detection for EF10.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/nfc')
0 files changed, 0 insertions, 0 deletions
