git.stricted.de - GitHub/moto-9609/android_kernel_motorola_exynos9610.git/commit

projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 041110a d7c1255)

author	David S. Miller <davem@davemloft.net>
	Mon, 27 Dec 2010 06:37:05 +0000 (22:37 -0800)
committer	David S. Miller <davem@davemloft.net>
	Mon, 27 Dec 2010 06:37:05 +0000 (22:37 -0800)
commit	17f7f4d9fcce8f1b75b5f735569309dee7665968
tree	14d7e49ca0053a0fcab3c33b5023bf3f90c5c08a	tree \| snapshot (tar.gz zip)
parent	041110a439e21cd40709ead4ffbfa8034619ad77	commit \| diff
parent	d7c1255a3a21e98bdc64df8ccf005a174d7e6289	commit \| diff

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

Conflicts:
net/ipv4/fib_frontend.c

12 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/mlx4/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/atl1c/atl1c_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/sundance.c	diff1 \|	diff2 \|	blob \| history
include/net/flow.h	diff1 \|	diff2 \|	blob \| history
net/ipv4/fib_frontend.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/Kconfig	diff1 \|	diff2 \|	blob \| history
net/mac80211/rx.c	diff1 \|	diff2 \|	blob \| history
security/selinux/hooks.c	diff1 \|	diff2 \|	blob \| history