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

diff --cc include/linux/audit.h
Simple merge

diff --cc include/linux/netfilter/x_tables.h
Simple merge

diff --cc kernel/audit.c
Simple merge

diff --cc net/ipv4/Kconfig
Simple merge

diff --cc net/ipv4/netfilter/arp_tables.c
Simple merge

diff --cc net/ipv4/netfilter/ip_tables.c
Simple merge

diff --cc net/ipv6/netfilter/ip6_tables.c
Simple merge

diff --cc net/netfilter/nf_conntrack_netlink.c
Simple merge

diff --cc net/netfilter/x_tables.c
Simple merge

diff --cc net/sched/Kconfig
Simple merge