Merge pobox.com:/garz/repo/linux-2.6

into pobox.com:/garz/repo/netdev-2.6/misc

drivers/net/Kconfig

@@ -1181,6 +1181,7 @@ config IBMVETH
 config IBM_EMAC
 	tristate "IBM PPC4xx EMAC driver support"
 	depends on 4xx
+	select CRC32
 	---help---
 	  This driver supports the IBM PPC4xx EMAC family of on-chip
 	  Ethernet controllers.

drivers/net/sis900.c

@@ -120,6 +120,7 @@ static struct mii_chip_info {
 } mii_chip_table[] = {
 	{ "SiS 900 Internal MII PHY", 		0x001d, 0x8000, LAN },
 	{ "SiS 7014 Physical Layer Solution", 	0x0016, 0xf830, LAN },
+	{ "Altimata AC101LF PHY",               0x0022, 0x5520, LAN },
 	{ "AMD 79C901 10BASE-T PHY",  		0x0000, 0x6B70, LAN },
 	{ "AMD 79C901 HomePNA PHY",		0x0000, 0x6B90, HOME},
 	{ "ICS LAN PHY",			0x0015, 0xF440, LAN },