From: Linus Torvalds 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-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6314410dd1e9db1c0009b0f7b56cc771a4d1e85a;p=mv-sheeva.git Merge branch 'upstream' of master.kernel.org:/pub/scm/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