Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

diff --cc drivers/net/atlx/atl1.c
Simple merge

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

diff --cc drivers/net/ehea/ehea_ethtool.c
Simple merge

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

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

diff --cc net/bridge/br_multicast.c
Simple merge

diff --cc net/bridge/br_stp_bpdu.c
Simple merge

diff --cc net/ipv4/route.c
Simple merge