From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 20 Feb 2010 03:34:56 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.33~27
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8386cda3f9faadcdcf0205ab6b84b03ce4ee1f6f;p=karo-tx-linux.git

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

8386cda3f9faadcdcf0205ab6b84b03ce4ee1f6f