tree 1ef2c1b1fdd09964a62dd49beba4c0cb84e079d4
parent 9462544fdfe06c1d0d535876fedb4b886c861c73
parent ade21372b7c6927861845d65432ff0b0b1142ca0
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1180540953 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1180540953 -0700

Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
  ehea: Fixed multi queue RX bug
  sky2: enable IRQ on duplex renegotiation
  e1000: restore netif_poll_enable call but make sure IRQs are off
  defxx: Fix the handling of ioremap() failures
  sky2: program proper register for fiber PHY
  sky2: checksum offload plus vlan bug
  sky2: dont set bogus bit in PHY register
  [PATCH] hostap: Allocate enough tailroom for TKIP
  [PATCH] softmac: alloc_ieee80211() NULL check
  [PATCH] ieee80211: fix incomplete error message
  [PATCH] prism54: fix monitor mode oops