]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 20 Feb 2010 03:34:56 +0000 (19:34 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 20 Feb 2010 03:34:56 +0000 (19:34 -0800)
commit8386cda3f9faadcdcf0205ab6b84b03ce4ee1f6f
tree8f7be8e77f9915bc0a276f1263674ad8448415ee
parent83bdd240eeb388a611b2bdbed9afdb3192966cec
parent242cc0547f3bcecc0b02ca6f3e9512760185727e
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...