tree 8f7be8e77f9915bc0a276f1263674ad8448415ee
parent 83bdd240eeb388a611b2bdbed9afdb3192966cec
parent 242cc0547f3bcecc0b02ca6f3e9512760185727e
author Linus Torvalds <torvalds@linux-foundation.org> 1266636896 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1266636896 -0800

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...