aboutsummaryrefslogtreecommitdiff
path: root/include/linux/hwmon-vid.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-07-01 10:29:26 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-07-01 10:29:26 -0700
commit7b85425fac72588674d5c71604af618f690c91d7 (patch)
tree679b1df68e58b0fc9e898b688e51387591b0bdad /include/linux/hwmon-vid.h
parent57d81f6f393b245894ca0cd828f80ce7e3294f39 (diff)
parentf8a68e752bc4e39644843403168137663c984524 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (31 commits) Revert "ipv4: arp announce, arp_proxy and windows ip conflict verification" igb: return PCI_ERS_RESULT_DISCONNECT on permanent error e1000e: io_error_detected callback should return PCI_ERS_RESULT_DISCONNECT e1000: return PCI_ERS_RESULT_DISCONNECT on permanent error e1000: fix unmap bug igb: fix unmap length bug ixgbe: fix unmap length bug ixgbe: Fix link capabilities during adapter resets ixgbe: Fix device capabilities of 82599 single speed fiber NICs. ixgbe: Fix SFP log messages usbnet: Remove private stats structure usbnet: Use netdev stats structure smsc95xx: Use netdev stats structure rndis_host: Use netdev stats structure net1080: Use netdev stats structure dm9601: Use netdev stats structure cdc_eem: Use netdev stats structure ipv4: Fix fib_trie rebalancing, part 3 bnx2x: Fix the behavior of ethtool when ONBOOT=no sctp: xmit sctp packet always return no route error ...
Diffstat (limited to 'include/linux/hwmon-vid.h')
0 files changed, 0 insertions, 0 deletions