Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 26 Aug 2009 04:24:49 +0000 (21:24 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 26 Aug 2009 04:24:49 +0000 (21:24 -0700)
commitf415c413f458837bd0c27086b79aca889f9435e4
treeb5c09f326b07637f97ddc2c1795ffbbef62bed23
parent4dc627d55edad85e26ae81f17634bd4590993ba0
parent4484b9c8b4976acee181d377f8ba571109d1a2be
Merge git://git./linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  irda/sa1100_ir: fix broken netdev_ops conversion
  irda/au1k_ir: fix broken netdev_ops conversion
  pkt_sched: Fix bogon in tasklet_hrtimer changes.