Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 7 Aug 2009 17:46:27 +0000 (10:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 7 Aug 2009 17:46:27 +0000 (10:46 -0700)
commitcba8784ae0a9f7d0f1f87e0607e7ae66fc45666c
tree58a53f6b8db0ec64e93ebece1c1f07aa54502544
parent9cf9d28e9bf991af21fc4bbf33281b66843b094b
parent0bf52b981770cbf006323bab5177f2858a196766
Merge git://git./linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  net: Fix spinlock use in alloc_netdev_mq()