Merge remote-tracking branch 'net/master'

Conflicts:
	arch/powerpc/configs/40x/hcu4_defconfig

diff --cc MAINTAINERS
Simple merge

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/powerpc/configs/ppc40x_defconfig
Simple merge

diff --cc arch/powerpc/configs/ppc64_defconfig
index 84a685a505fe115a39ebfbe99ce3baa399bf85d3,84a685a505fe115a39ebfbe99ce3baa399bf85d3..9a424c4cb0f2714cb947f824a297f55f20fcc3ff
--- 1/arch/powerpc/configs/ppc64_defconfig
--- 2/arch/powerpc/configs/ppc64_defconfig
+++ b/arch/powerpc/configs/ppc64_defconfig
@@@ -49,7 -49,7 +49,6 @@@ CONFIG_NO_HZ=
  CONFIG_HIGH_RES_TIMERS=y
  CONFIG_HZ_100=y
  CONFIG_BINFMT_MISC=m
--CONFIG_HOTPLUG_CPU=y
  CONFIG_KEXEC=y
  CONFIG_IRQ_ALL_CPUS=y
  CONFIG_MEMORY_HOTREMOVE=y
@@@ -75,7 -75,7 +74,6 @@@ CONFIG_INET_ESP=
  CONFIG_INET_IPCOMP=m
  # CONFIG_IPV6 is not set
  CONFIG_NETFILTER=y
--CONFIG_NETFILTER_NETLINK_QUEUE=m
  CONFIG_NF_CONNTRACK=m
  CONFIG_NF_CONNTRACK_EVENTS=y
  CONFIG_NF_CT_PROTO_SCTP=m
@@@ -133,7 -133,7 +131,6 @@@ CONFIG_NETFILTER_XT_MATCH_U32=
  CONFIG_NF_CONNTRACK_IPV4=m
  CONFIG_IP_NF_QUEUE=m
  CONFIG_IP_NF_IPTABLES=m
--CONFIG_IP_NF_MATCH_ADDRTYPE=m
  CONFIG_IP_NF_MATCH_AH=m
  CONFIG_IP_NF_MATCH_ECN=m
  CONFIG_IP_NF_MATCH_TTL=m
@@@ -145,7 -145,7 +142,6 @@@ CONFIG_NF_NAT=
  CONFIG_IP_NF_TARGET_MASQUERADE=m
  CONFIG_IP_NF_TARGET_NETMAP=m
  CONFIG_IP_NF_TARGET_REDIRECT=m
--CONFIG_NF_NAT_SNMP_BASIC=m
  CONFIG_IP_NF_MANGLE=m
  CONFIG_IP_NF_TARGET_CLUSTERIP=m
  CONFIG_IP_NF_TARGET_ECN=m
@@@ -176,7 -176,7 +172,6 @@@ CONFIG_CHR_DEV_SG=
  CONFIG_SCSI_MULTI_LUN=y
  CONFIG_SCSI_CONSTANTS=y
  CONFIG_SCSI_FC_ATTRS=y
--CONFIG_SCSI_SAS_ATTRS=m
  CONFIG_SCSI_CXGB3_ISCSI=m
  CONFIG_SCSI_CXGB4_ISCSI=m
  CONFIG_SCSI_BNX2_ISCSI=m
@@@ -208,13 -208,13 +203,6 @@@ CONFIG_DM_SNAPSHOT=
  CONFIG_DM_MIRROR=m
  CONFIG_DM_ZERO=m
  CONFIG_DM_MULTIPATH=m
--CONFIG_IEEE1394=y
--CONFIG_IEEE1394_OHCI1394=y
--CONFIG_IEEE1394_SBP2=m
--CONFIG_IEEE1394_ETH1394=m
--CONFIG_IEEE1394_RAWIO=y
--CONFIG_IEEE1394_VIDEO1394=m
--CONFIG_IEEE1394_DV1394=m
  CONFIG_ADB_PMU=y
  CONFIG_PMAC_SMU=y
  CONFIG_THERM_PM72=y
@@@ -223,43 -223,43 +211,49 @@@ CONFIG_WINDFARM_PM81=
  CONFIG_WINDFARM_PM91=y
  CONFIG_WINDFARM_PM112=y
  CONFIG_WINDFARM_PM121=y
--CONFIG_NETDEVICES=y
  CONFIG_DUMMY=m
  CONFIG_BONDING=m
  CONFIG_TUN=m
  CONFIG_MARVELL_PHY=y
  CONFIG_BROADCOM_PHY=m
--CONFIG_NET_ETHERNET=y
--CONFIG_SUNGEM=y
  CONFIG_NET_VENDOR_3COM=y
  CONFIG_VORTEX=y
--CONFIG_IBMVETH=m
--CONFIG_NET_PCI=y
--CONFIG_PCNET32=y
--CONFIG_E100=y
++CONFIG_NET_VENDOR_ALTEON=y
  CONFIG_ACENIC=m
  CONFIG_ACENIC_OMIT_TIGON_I=y
--CONFIG_E1000=y
--CONFIG_E1000E=y
++CONFIG_NET_VENDOR_AMD=y
++CONFIG_PCNET32=y
  CONFIG_TIGON3=y
--CONFIG_BNX2=m
--CONFIG_SPIDER_NET=m
--CONFIG_GELIC_NET=m
--CONFIG_GELIC_WIRELESS=y
  CONFIG_CHELSIO_T1=m
--CONFIG_CHELSIO_T3=m
--CONFIG_CHELSIO_T4=m
++CONFIG_NET_VENDOR_EMULEX=y
++CONFIG_BE2NET=m
++CONFIG_NET_VENDOR_EXAR=y
++CONFIG_S2IO=m
++CONFIG_NET_VENDOR_IBM=y
++CONFIG_IBMVETH=m
++CONFIG_ISERIES_VETH=m
  CONFIG_EHEA=m
--CONFIG_IXGBE=m
++CONFIG_NET_VENDOR_INTEL=y
++CONFIG_E100=y
++CONFIG_E1000=y
++CONFIG_E1000E=y
  CONFIG_IXGB=m
--CONFIG_S2IO=m
++CONFIG_IXGBE=m
++CONFIG_MLX4_EN=m
++CONFIG_NET_VENDOR_MYRI=y
  CONFIG_MYRI10GE=m
--CONFIG_NETXEN_NIC=m
++CONFIG_NET_VENDOR_NVIDIA=y
++CONFIG_NET_VENDOR_PASEMI=y
  CONFIG_PASEMI_MAC=y
--CONFIG_MLX4_EN=m
++CONFIG_NET_VENDOR_QLOGIC=y
  CONFIG_QLGE=m
--CONFIG_BE2NET=m
--CONFIG_ISERIES_VETH=m
++CONFIG_NETXEN_NIC=m
++CONFIG_NET_VENDOR_SUN=y
++CONFIG_SUNGEM=y
++CONFIG_NET_VENDOR_TOSHIBA=y
++CONFIG_GELIC_NET=m
++CONFIG_GELIC_WIRELESS=y
++CONFIG_SPIDER_NET=m
  CONFIG_PPP=m
  CONFIG_PPP_ASYNC=m
  CONFIG_PPP_SYNC_TTY=m
@@@ -331,7 -331,7 +325,6 @@@ CONFIG_USB=
  CONFIG_USB_DEVICEFS=y
  CONFIG_USB_MON=m
  CONFIG_USB_EHCI_HCD=y
--CONFIG_USB_EHCI_TT_NEWSCHED=y
  # CONFIG_USB_EHCI_HCD_PPC_OF is not set
  CONFIG_USB_OHCI_HCD=y
  CONFIG_USB_STORAGE=m
@@@ -373,11 -373,11 +366,9 @@@ CONFIG_JFS_POSIX_ACL=
  CONFIG_JFS_SECURITY=y
  CONFIG_XFS_FS=m
  CONFIG_XFS_POSIX_ACL=y
--CONFIG_OCFS2_FS=m
  CONFIG_BTRFS_FS=m
  CONFIG_BTRFS_FS_POSIX_ACL=y
  CONFIG_NILFS2_FS=m
--CONFIG_INOTIFY=y
  CONFIG_AUTOFS4_FS=m
  CONFIG_FUSE_FS=m
  CONFIG_ISO9660_FS=y
@@@ -398,7 -398,7 +389,6 @@@ CONFIG_ROOT_NFS=
  CONFIG_NFSD=m
  CONFIG_NFSD_V3_ACL=y
  CONFIG_NFSD_V4=y
--CONFIG_RPCSEC_GSS_SPKM3=m
  CONFIG_CIFS=m
  CONFIG_CIFS_XATTR=y
  CONFIG_CIFS_POSIX=y
@@@ -444,15 -444,15 +434,13 @@@ CONFIG_CRC_T10DIF=
  CONFIG_MAGIC_SYSRQ=y
  CONFIG_DEBUG_KERNEL=y
  CONFIG_LOCKUP_DETECTOR=y
--CONFIG_DETECT_HUNG_TASK=y
  CONFIG_DEBUG_MUTEXES=y
--# CONFIG_RCU_CPU_STALL_DETECTOR is not set
++CONFIG_DEBUG_STACK_USAGE=y
  CONFIG_LATENCYTOP=y
  CONFIG_SYSCTL_SYSCALL_CHECK=y
  CONFIG_SCHED_TRACER=y
  CONFIG_BLK_DEV_IO_TRACE=y
  CONFIG_DEBUG_STACKOVERFLOW=y
--CONFIG_DEBUG_STACK_USAGE=y
  CONFIG_CODE_PATCHING_SELFTEST=y
  CONFIG_FTR_FIXUP_SELFTEST=y
  CONFIG_MSI_BITMAP_SELFTEST=y
@@@ -463,10 -463,10 +451,8 @@@ CONFIG_CRYPTO_NULL=
  CONFIG_CRYPTO_TEST=m
  CONFIG_CRYPTO_CCM=m
  CONFIG_CRYPTO_GCM=m
--CONFIG_CRYPTO_ECB=m
  CONFIG_CRYPTO_PCBC=m
  CONFIG_CRYPTO_HMAC=y
--CONFIG_CRYPTO_MD4=m
  CONFIG_CRYPTO_MICHAEL_MIC=m
  CONFIG_CRYPTO_SHA256=m
  CONFIG_CRYPTO_SHA512=m
@@@ -474,7 -474,7 +460,6 @@@ CONFIG_CRYPTO_TGR192=
  CONFIG_CRYPTO_WP512=m
  CONFIG_CRYPTO_AES=m
  CONFIG_CRYPTO_ANUBIS=m
--CONFIG_CRYPTO_ARC4=m
  CONFIG_CRYPTO_BLOWFISH=m
  CONFIG_CRYPTO_CAST6=m
  CONFIG_CRYPTO_KHAZAD=m

diff --cc arch/powerpc/platforms/40x/Kconfig
Simple merge

diff --cc drivers/infiniband/ulp/ipoib/ipoib_main.c
Simple merge

diff --cc drivers/net/cris/eth_v10.c
Simple merge

diff --cc drivers/net/ethernet/cadence/at91_ether.c
Simple merge