git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit

]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit

projects / mirror_ubuntu-disco-kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f5c88f5 a5db219)

author	Patrick McHardy <kaber@trash.net>
	Wed, 19 Jan 2011 22:51:37 +0000 (23:51 +0100)
committer	Patrick McHardy <kaber@trash.net>
	Wed, 19 Jan 2011 22:51:37 +0000 (23:51 +0100)
commit	14f0290ba44de6ed435fea24bba26e7868421c66
tree	449d32e4848007e3edbcab14fa8e09fdc66608ed	tree
parent	f5c88f56b35599ab9ff2d3398e0153e4cd4a4c82	commit \| diff
parent	a5db219f4cf9f67995eabd53b81a1232c82f5852	commit \| diff

Merge branch 'master' of /repos/git/net-next-2.6

include/linux/audit.h	diff1 \|	diff2 \|	blob \| history
include/linux/netfilter/x_tables.h	diff1 \|	diff2 \|	blob \| history
kernel/audit.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/Kconfig	diff1 \|	diff2 \|	blob \| history
net/ipv4/netfilter/arp_tables.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/netfilter/ip_tables.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/netfilter/ip6_tables.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_conntrack_netlink.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/x_tables.c	diff1 \|	diff2 \|	blob \| history
net/sched/Kconfig	diff1 \|	diff2 \|	blob \| history

Ubuntu Disco kernel mirror for Proxmox VE and PMG