[GIT]: Networking

David Miller
2009-08-26T03:50:48Z

1) Fix for warning introduced unintentionally last round, spotted by
Stephen Rothwell.

2) Fix for two incorrect netdev_ops conversions in IRDA, from
Alex Beregalov.

Please pull, thanks a lot!

The following changes since commit 7c0a57d5c47bcfc492b3139e77400f888a935c44:
Linus Torvalds (1):
Merge branch 'fixes' of git://git.marvell.com/orion

are available in the git repository at:

master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git master

Alexander Beregalov (2):
irda/au1k_ir: fix broken netdev_ops conversion
irda/sa1100_ir: fix broken netdev_ops conversion

David S. Miller (1):
pkt_sched: Fix bogon in tasklet_hrtimer changes.

drivers/net/irda/au1k_ir.c | 4 ----
drivers/net/irda/sa1100_ir.c | 4 ----
net/sched/sch_api.c | 2 +-
net/sched/sch_cbq.c | 2 +-
4 files changed, 2 insertions(+), 10 deletions(-)