git.stricted.de - GitHub/exynos8895/android_kernel_samsung

author	David S. Miller <davem@davemloft.net>
	Fri, 31 Oct 2008 07:17:34 +0000 (00:17 -0700)
committer	David S. Miller <davem@davemloft.net>
	Fri, 31 Oct 2008 07:17:34 +0000 (00:17 -0700)
commit	a1744d3bee19d3b9cbfb825ab316a101b9c9f109
tree	c0e2324c09beca0eb5782eb5abf241ea2b7a4a11	tree \| snapshot (tar.gz zip)
parent	275f165fa970174f8a98205529750e8abb6c0a33	commit \| diff
parent	a432226614c5616e3cfd211e0acffa0acfb4770c	commit \| diff

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

Conflicts:

drivers/net/wireless/p54/p54common.c

24 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/amd8111e.c	diff1 \|	diff2 \|	blob \| history
drivers/net/arm/at91_ether.c	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/gianfar.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ibm_newemac/core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/myri10ge/myri10ge.c	diff1 \|	diff2 \|	blob \| history
drivers/net/pppoe.c	diff1 \|	diff2 \|	blob \| history
drivers/net/smc91x.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tulip/dmfe.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-agn.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/cmd.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/scan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/p54/p54common.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/p54/p54pci.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/net/qeth_l2_main.c	diff1 \|	diff2 \|	blob \| history
include/linux/kernel.h	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
net/core/net_namespace.c	diff1 \|	diff2 \|	blob \| history
net/core/pktgen.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/cipso_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/netlabel/netlabel_addrlist.c	diff1 \|	diff2 \|	blob \| history
net/sunrpc/xprtsock.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_policy.c	diff1 \|	diff2 \|	blob \| history

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/amd8111e.c	diff1 \|	diff2 \|	blob \| history
drivers/net/arm/at91_ether.c	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/gianfar.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ibm_newemac/core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/myri10ge/myri10ge.c	diff1 \|	diff2 \|	blob \| history
drivers/net/pppoe.c	diff1 \|	diff2 \|	blob \| history
drivers/net/smc91x.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tulip/dmfe.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-agn.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/cmd.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/scan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/p54/p54common.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/p54/p54pci.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/net/qeth_l2_main.c	diff1 \|	diff2 \|	blob \| history
include/linux/kernel.h	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
net/core/net_namespace.c	diff1 \|	diff2 \|	blob \| history
net/core/pktgen.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/cipso_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/netlabel/netlabel_addrlist.c	diff1 \|	diff2 \|	blob \| history
net/sunrpc/xprtsock.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_policy.c	diff1 \|	diff2 \|	blob \| history