git.oblomov.eu Git - linux-2.6/commit

projects / linux-2.6 / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 93c8b90 0523820)

author	David S. Miller <davem@davemloft.net>
	Wed, 1 Oct 2008 13:12:56 +0000 (06:12 -0700)
committer	David S. Miller <davem@davemloft.net>
	Wed, 1 Oct 2008 13:12:56 +0000 (06:12 -0700)
commit	b262e60309e1b0eb25d300c7e739427d5316abb1
tree	bf319d78c79bb5cb617ff0c8340c73aa349bba15	tree \| snapshot
parent	93c8b90f01f0dc73891da4e84b26524b61d29d66	commit \| diff
parent	0523820482dcb42784572ffd2296c2f08c275a2b	commit \| diff

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

Conflicts:

drivers/net/wireless/ath9k/core.c
drivers/net/wireless/ath9k/main.c
net/core/dev.c

15 files changed:

Documentation/feature-removal-schedule.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/bnx2.h	diff1 \|	diff2 \|	blob \| history
drivers/net/e100.c	diff1 \|	diff2 \|	blob \| history
drivers/net/forcedeth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath9k/core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath9k/core.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath9k/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath9k/xmit.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/b43/rfkill.c	diff1 \|	diff2 \|	blob \| history
include/net/netlink.h	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/tcp_ipv6.c	diff1 \|	diff2 \|	blob \| history

Making Linux better for my computers