tree 3c79740e3580e403df02daafba26fa6e67552c16
parent e9ee3a54a164c249a0a576c403eba367a6d97be5
parent 16ebb5e0b36ceadc8186f71d68b0c4fa4b6e781b
author Linus Torvalds <torvalds@linux-foundation.org> 1252187561 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1252187561 -0700

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:
  tc: Fix unitialized kernel memory leak
  pkt_sched: Revert tasklet_hrtimer changes.
  net: sk_free() should be allowed right after sk_alloc()
  gianfar: gfar_remove needs to call unregister_netdev()
  ipw2200: firmware DMA loading rework