From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 30 May 2007 16:02:33 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: accepted/tizen/common/20141203.182822~30697
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=aa2d3322989d8fd40fb2e417142c9a029d7831a4;p=platform%2Fkernel%2Flinux-arm64.git

Merge branch 'upstream-linus' of /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
---

aa2d3322989d8fd40fb2e417142c9a029d7831a4