Merge branch 'net-const'

diff --cc drivers/net/3c59x.c
Simple merge

diff --cc drivers/net/bonding/bond_main.c
Simple merge

diff --cc drivers/net/ns83820.c
Simple merge

diff --cc drivers/net/pcmcia/3c589_cs.c
Simple merge

diff --cc drivers/net/pcmcia/pcnet_cs.c
Simple merge

diff --cc drivers/net/s2io.c
Simple merge

diff --cc drivers/net/starfire.c
Simple merge

diff --cc drivers/net/sundance.c
Simple merge