From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 2 Jun 2009 16:49:06 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.30-rc8~4
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=ca55bd7e2905d344bf697f7c2cc347cb42999e7a;p=~shefty%2Frdma-dev.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:
  net_cls: fix unconfigured struct tcf_proto keeps chaining and avoid kernel panic when we use cls_cgroup
  e1000: add missing length check to e1000 receive routine
  forcedeth: add phy_power_down parameter, leave phy powered up by default (v2)
  Bluetooth: Remove useless flush_work() causing lockdep warnings
---

ca55bd7e2905d344bf697f7c2cc347cb42999e7a