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: 6802454 f6f7b52)

author	David S. Miller <davem@davemloft.net>
	Wed, 3 Dec 2008 03:50:27 +0000 (19:50 -0800)
committer	David S. Miller <davem@davemloft.net>
	Wed, 3 Dec 2008 03:50:27 +0000 (19:50 -0800)
commit	aa2ba5f1082dc705745899584aac8416d710c056
tree	bde0bf4aff036c6bac19a0212194ae1092afb3c9	tree \| snapshot (tar.gz zip)
parent	68024541e2e5a8f35e281daaa5068a29e2a538a5	commit \| diff
parent	f6f7b52e2f6149d2ee365717afff315b05720162	commit \| diff

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

Conflicts:

drivers/net/ixgbe/ixgbe_main.c
drivers/net/smc91x.c

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/media/dvb/dm1105/dm1105.c	diff1 \|	diff2 \|	blob \| history
drivers/net/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/macvlan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/smc911x.c	diff1 \|	diff2 \|	blob \| history
drivers/net/smc91x.c	diff1 \|	diff2 \|	blob \| history
drivers/net/xen-netfront.c	diff1 \|	diff2 \|	blob \| history
net/unix/af_unix.c	diff1 \|	diff2 \|	blob \| history
net/unix/garbage.c	diff1 \|	diff2 \|	blob \| history