Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
commitca55bd7e2905d344bf697f7c2cc347cb42999e7a
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 2 Jun 2009 16:49:06 +0000 (2 09:49 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 2 Jun 2009 16:49:06 +0000 (2 09:49 -0700)
treef2b45dcfd55e72398d29320d2b3b9c3bace94a85
parent4157fd85fc794bb7896b65c0cf686aa89d711d57
parent12186be7d2e1106cede1cc728526e3d7998cbe94
Merge git://git./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