git.stricted.de - GitHub/MotorolaMobilityLLC/kernel-slsi.git/commit

projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commit

author	David S. Miller <davem@davemloft.net>
	Wed, 7 Apr 2010 06:53:30 +0000 (23:53 -0700)
committer	David S. Miller <davem@davemloft.net>
	Wed, 7 Apr 2010 06:53:30 +0000 (23:53 -0700)
commit	4a35ecf8bf1c4b039503fa554100fe85c761de76
tree	9b75f5d5636004d9a9aa496924377379be09aa1f	tree \| snapshot (tar.gz zip)
parent	b4d562e3c3553ac58c7120555c4e4aefbb090a2a	commit \| diff
parent	fb9e2d887243499b8d28efcf80821c4f6a092395	commit \| diff

Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
drivers/net/bonding/bond_main.c
drivers/net/via-velocity.c
drivers/net/wireless/iwlwifi/iwl-agn.c

44 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/microblaze/include/asm/system.h	diff1 \|	diff2 \|	blob \| history
drivers/net/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/net/benet/be_cmds.c	diff1 \|	diff2 \|	blob \| history
drivers/net/benet/be_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/benet/be_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/bnx2.c	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/cxgb4/cxgb4_main.c	\|	diff2 \|	blob \| history
drivers/net/e1000/e1000_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/e1000e/e1000.h	diff1 \|	diff2 \|	blob \| history
drivers/net/e1000e/netdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/gianfar.c	diff1 \|	diff2 \|	blob \| history
drivers/net/igb/igb.h	diff1 \|	diff2 \|	blob \| history
drivers/net/igb/igb_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/igbvf/netdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ixgbe/ixgbe_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ixgbe/ixgbe_type.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ixgbevf/ixgbevf_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ksz884x.c	diff1 \|	diff2 \|	blob \| history
drivers/net/netxen/netxen_nic.h	diff1 \|	diff2 \|	blob \| history
drivers/net/netxen/netxen_nic_init.c	diff1 \|	diff2 \|	blob \| history
drivers/net/netxen/netxen_nic_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/pcmcia/smc91c92_cs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/r8169.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tulip/uli526x.c	diff1 \|	diff2 \|	blob \| history
drivers/net/via-velocity.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-4965.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-agn.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl3945-base.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/dev.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwl8k.c	diff1 \|	diff2 \|	blob \| history
include/linux/skbuff.h	diff1 \|	diff2 \|	blob \| history
include/linux/socket.h	diff1 \|	diff2 \|	blob \| history
include/linux/tty.h	diff1 \|	diff2 \|	blob \| history
net/8021q/vlan.c	diff1 \|	diff2 \|	blob \| history
net/8021q/vlan_dev.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/af_inet.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/devinet.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/addrconf.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/tx.c	diff1 \|	diff2 \|	blob \| history
net/netlink/af_netlink.c	diff1 \|	diff2 \|	blob \| history
net/socket.c	diff1 \|	diff2 \|	blob \| history

Motorola kernel-slsi

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/microblaze/include/asm/system.h	diff1 \|	diff2 \|	blob \| history
drivers/net/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/net/benet/be_cmds.c	diff1 \|	diff2 \|	blob \| history
drivers/net/benet/be_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/benet/be_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/bnx2.c	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/cxgb4/cxgb4_main.c	\|	diff2 \|	blob \| history
drivers/net/e1000/e1000_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/e1000e/e1000.h	diff1 \|	diff2 \|	blob \| history
drivers/net/e1000e/netdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/gianfar.c	diff1 \|	diff2 \|	blob \| history
drivers/net/igb/igb.h	diff1 \|	diff2 \|	blob \| history
drivers/net/igb/igb_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/igbvf/netdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ixgbe/ixgbe_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ixgbe/ixgbe_type.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ixgbevf/ixgbevf_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ksz884x.c	diff1 \|	diff2 \|	blob \| history
drivers/net/netxen/netxen_nic.h	diff1 \|	diff2 \|	blob \| history
drivers/net/netxen/netxen_nic_init.c	diff1 \|	diff2 \|	blob \| history
drivers/net/netxen/netxen_nic_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/pcmcia/smc91c92_cs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/r8169.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tulip/uli526x.c	diff1 \|	diff2 \|	blob \| history
drivers/net/via-velocity.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-4965.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-agn.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl3945-base.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/dev.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwl8k.c	diff1 \|	diff2 \|	blob \| history
include/linux/skbuff.h	diff1 \|	diff2 \|	blob \| history
include/linux/socket.h	diff1 \|	diff2 \|	blob \| history
include/linux/tty.h	diff1 \|	diff2 \|	blob \| history
net/8021q/vlan.c	diff1 \|	diff2 \|	blob \| history
net/8021q/vlan_dev.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/af_inet.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/devinet.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/addrconf.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/tx.c	diff1 \|	diff2 \|	blob \| history
net/netlink/af_netlink.c	diff1 \|	diff2 \|	blob \| history
net/socket.c	diff1 \|	diff2 \|	blob \| history