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

Conflicts:
	drivers/net/Kconfig

diff --cc drivers/net/Kconfig
index 0ec01e42e9b168881c08fba086218214332ba3ba,6bdfd47d679d9425d777ac68cc7b6b22d13e46f0..49f4d50abc563c7e570ff0b2f61e7e3ad4b404a8
--- 1/drivers/net/Kconfig
--- 2/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@@ -1828,11 -1828,11 +1828,11 @@@ config 68360_ENE
          the Motorola 68360 processor.
  
  config FEC
-       bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)"
-       depends on M523x || M527x || M5272 || M528x || M520x || MACH_MX27
+       bool "FEC ethernet controller (of ColdFire CPUs)"
 -      depends on M523x || M527x || M5272 || M528x || M520x || M532x
++      depends on M523x || M527x || M5272 || M528x || M520x || M532x || MACH_MX27
        help
          Say Y here if you want to use the built-in 10/100 Fast ethernet
 -        controller on some Motorola ColdFire processors.
 +        controller on some Motorola ColdFire and Freescale i.MX processors.
  
  config FEC2
        bool "Second FEC ethernet controller (on some ColdFire CPUs)"

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

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

diff --cc drivers/net/igb/e1000_82575.c
Simple merge

diff --cc drivers/net/igb/igb.h
Simple merge

diff --cc drivers/net/igb/igb_main.c
Simple merge

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

diff --cc drivers/net/qlge/qlge_main.c
Simple merge

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

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

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

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

diff --cc include/linux/pci_ids.h
Simple merge

diff --cc include/linux/virtio_net.h
Simple merge