diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-20 06:34:56 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-20 06:34:56 +0300 |
commit | 8386cda3f9faadcdcf0205ab6b84b03ce4ee1f6f (patch) | |
tree | 8f7be8e77f9915bc0a276f1263674ad8448415ee /drivers/hwmon/atxp1.c | |
parent | 83bdd240eeb388a611b2bdbed9afdb3192966cec (diff) | |
parent | 242cc0547f3bcecc0b02ca6f3e9512760185727e (diff) | |
download | linux-8386cda3f9faadcdcf0205ab6b84b03ce4ee1f6f.tar.xz |
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:
sfc: SFE4002/SFN4112F: Widen temperature and voltage tolerances
sfc: Fix sign of efx_mcdi_poll_reboot() error in efx_mcdi_poll()
net-sysfs: Use rtnl_trylock in wireless sysfs methods.
net: Fix sysctl restarts...
Diffstat (limited to 'drivers/hwmon/atxp1.c')
0 files changed, 0 insertions, 0 deletions