Merge branch 'master' of /repos/git/net-next-2.6

Conflicts:
	Documentation/feature-removal-schedule.txt
	net/ipv6/netfilter/ip6t_REJECT.c
	net/netfilter/xt_limit.c

Signed-off-by: Patrick McHardy <kaber@trash.net>

1 files changed, 11 insertions, 0 deletions

diff --git a/drivers/net/phy/smsc.c b/drivers/net/phy/smsc.c
index ed2644a57500..78fa988256fc 100644
--- a/drivers/net/phy/smsc.c
+++ b/drivers/net/phy/smsc.c
@@ -253,3 +253,14 @@ MODULE_LICENSE("GPL");
 
 module_init(smsc_init);
 module_exit(smsc_exit);
+
+static struct mdio_device_id smsc_tbl[] = {
+        { 0x0007c0a0, 0xfffffff0 },
+        { 0x0007c0b0, 0xfffffff0 },
+        { 0x0007c0c0, 0xfffffff0 },
+        { 0x0007c0d0, 0xfffffff0 },
+        { 0x0007c0f0, 0xfffffff0 },
+        { }
+};
+
+MODULE_DEVICE_TABLE(mdio, smsc_tbl);