git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	David S. Miller <davem@davemloft.net>
	Fri, 7 Nov 2008 06:43:03 +0000 (22:43 -0800)
committer	David S. Miller <davem@davemloft.net>
	Fri, 7 Nov 2008 06:43:03 +0000 (22:43 -0800)
commit	dd77e0333639dd2e66ebebe51341c23bbb49aa67
tree	3e0a58e25b776cfbee193195460324dccb1886c7	tree \| snapshot
parent	3f855ebde7fe58f8a4b166d8449bb40f9bb6410d	commit \| diff
parent	81a9055931fc3ad02a4edd3d364a7abd8e73e8ca	commit \| diff

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

Conflicts:

drivers/net/wireless/ath5k/base.c
net/8021q/vlan_core.c

31 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/3c509.c	diff1 \|	diff2 \|	blob \| history
drivers/net/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/bnx2x_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/cris/eth_v10.c	diff1 \|	diff2 \|	blob \| history
drivers/net/fs_enet/fs_enet-main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/irda/ks959-sir.c	diff1 \|	diff2 \|	blob \| history
drivers/net/irda/ksdazzle-sir.c	diff1 \|	diff2 \|	blob \| history
drivers/net/mv643xx_eth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/niu.c	diff1 \|	diff2 \|	blob \| history
drivers/net/smc911x.c	diff1 \|	diff2 \|	blob \| history
drivers/net/smc91x.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tun.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath5k/base.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/zd1211rw/zd_usb.c	diff1 \|	diff2 \|	blob \| history
fs/cifs/connect.c	diff1 \|	diff2 \|	blob \| history
net/8021q/vlan_core.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/udp.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/addrconf.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/udp.c	diff1 \|	diff2 \|	blob \| history
net/rfkill/rfkill.c	diff1 \|	diff2 \|	blob \| history
net/socket.c	diff1 \|	diff2 \|	blob \| history
net/unix/af_unix.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_policy.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_user.c	diff1 \|	diff2 \|	blob \| history
security/selinux/hooks.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/3c509.c	diff1 \|	diff2 \|	blob \| history
drivers/net/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/bnx2x_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/cris/eth_v10.c	diff1 \|	diff2 \|	blob \| history
drivers/net/fs_enet/fs_enet-main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/irda/ks959-sir.c	diff1 \|	diff2 \|	blob \| history
drivers/net/irda/ksdazzle-sir.c	diff1 \|	diff2 \|	blob \| history
drivers/net/mv643xx_eth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/niu.c	diff1 \|	diff2 \|	blob \| history
drivers/net/smc911x.c	diff1 \|	diff2 \|	blob \| history
drivers/net/smc91x.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tun.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath5k/base.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/zd1211rw/zd_usb.c	diff1 \|	diff2 \|	blob \| history
fs/cifs/connect.c	diff1 \|	diff2 \|	blob \| history
net/8021q/vlan_core.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/udp.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/addrconf.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/udp.c	diff1 \|	diff2 \|	blob \| history
net/rfkill/rfkill.c	diff1 \|	diff2 \|	blob \| history
net/socket.c	diff1 \|	diff2 \|	blob \| history
net/unix/af_unix.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_policy.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_user.c	diff1 \|	diff2 \|	blob \| history
security/selinux/hooks.c	diff1 \|	diff2 \|	blob \| history