]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Fri, 31 Oct 2008 07:17:34 +0000 (00:17 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 31 Oct 2008 07:17:34 +0000 (00:17 -0700)
commita1744d3bee19d3b9cbfb825ab316a101b9c9f109
treec0e2324c09beca0eb5782eb5abf241ea2b7a4a11
parent275f165fa970174f8a98205529750e8abb6c0a33
parenta432226614c5616e3cfd211e0acffa0acfb4770c
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

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