From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 10 May 2006 21:59:29 +0000 (-0700)
Subject: Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/shemminger... 
X-Git-Tag: firefly_0821_release~35832
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6314410dd1e9db1c0009b0f7b56cc771a4d1e85a;p=firefly-linux-kernel-4.4.55.git

Merge branch 'upstream' of /linux/kernel/git/shemminger/netdev-2.6

* 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/shemminger/netdev-2.6:
  sis900: phy for FoxCon motherboard
  dl2k: use DMA_48BIT_MASK constant
  phy: mdiobus_register(): initialize all phy_map entries
  sky2: ifdown kills irq mask
---

6314410dd1e9db1c0009b0f7b56cc771a4d1e85a