Linus Torvalds 229aebb873 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial ... * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits) Update broken web addresses in arch directory. Update broken web addresses in the kernel. Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget Revert "Fix typo: configuation => configuration" partially ida: document IDA_BITMAP_LONGS calculation ext2: fix a typo on comment in ext2/inode.c drivers/scsi: Remove unnecessary casts of private_data drivers/s390: Remove unnecessary casts of private_data net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data drivers/infiniband: Remove unnecessary casts of private_data drivers/gpu/drm: Remove unnecessary casts of private_data kernel/pm_qos_params.c: Remove unnecessary casts of private_data fs/ecryptfs: Remove unnecessary casts of private_data fs/seq_file.c: Remove unnecessary casts of private_data arm: uengine.c: remove C99 comments arm: scoop.c: remove C99 comments Fix typo configue => configure in comments Fix typo: configuation => configuration Fix typo interrest[ing|ed] => interest[ing|ed] Fix various typos of valid in comments ... Fix up trivial conflicts in: drivers/char/ipmi/ipmi_si_intf.c drivers/usb/gadget/rndis.c net/irda/irnet/irnet_ppp.c		2010-10-24 13:41:39 -07:00
..
ipvs	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6	2010-10-21 08:21:34 -07:00
core.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-10-23 11:47:02 -07:00
Kconfig
Makefile	netfilter: add xt_cpu match	2010-07-23 12:59:36 +02:00
nf_conntrack_acct.c
nf_conntrack_amanda.c	netfilter: cleanup printk messages	2010-05-13 15:02:08 +02:00
nf_conntrack_core.c	netfilter: save the hash of the tuple in the original direction for latter use	2010-09-21 17:49:20 +02:00
nf_conntrack_ecache.c
nf_conntrack_expect.c	netfilter: ctnetlink: add expectation deletion events	2010-10-19 10:19:06 +02:00
nf_conntrack_extend.c	Merge commit 'v2.6.36-rc7' into core/rcu	2010-10-07 09:43:45 +02:00
nf_conntrack_ftp.c
nf_conntrack_h323_asn1.c
nf_conntrack_h323_main.c	net-next: remove useless union keyword	2010-06-10 23:31:35 -07:00
nf_conntrack_h323_types.c
nf_conntrack_helper.c
nf_conntrack_irc.c
nf_conntrack_l3proto_generic.c
nf_conntrack_netbios_ns.c	net-next: remove useless union keyword	2010-06-10 23:31:35 -07:00
nf_conntrack_netlink.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-10-23 11:47:02 -07:00
nf_conntrack_pptp.c
nf_conntrack_proto.c	net/netfilter: __rcu annotations	2010-08-19 17:18:01 -07:00
nf_conntrack_proto_dccp.c
nf_conntrack_proto_generic.c
nf_conntrack_proto_gre.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
nf_conntrack_proto_sctp.c
nf_conntrack_proto_tcp.c	Update broken web addresses in the kernel.	2010-10-18 11:03:14 +02:00
nf_conntrack_proto_udp.c
nf_conntrack_proto_udplite.c
nf_conntrack_sane.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
nf_conntrack_sip.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6	2010-10-21 08:21:34 -07:00
nf_conntrack_standalone.c	secmark: export secctx, drop secmark in procfs	2010-10-21 10:12:52 +11:00
nf_conntrack_tftp.c
nf_internals.h
nf_log.c
nf_queue.c
nf_sockopt.c
nf_tproxy_core.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6	2010-10-21 08:21:34 -07:00
nfnetlink.c
nfnetlink_log.c
nfnetlink_queue.c
x_tables.c	netfilter: unregister nf hooks, matches and targets in the reverse order	2010-10-04 22:24:12 +02:00
xt_CHECKSUM.c
xt_CLASSIFY.c
xt_cluster.c
xt_comment.c
xt_connbytes.c
xt_connlimit.c	netfilter: xtables: change hotdrop pointer to direct modification	2010-05-11 18:35:27 +02:00
xt_connmark.c
xt_CONNSECMARK.c
xt_conntrack.c
xt_cpu.c
xt_CT.c	secmark: make secmark object handling generic	2010-10-21 10:12:48 +11:00
xt_dccp.c
xt_DSCP.c
xt_dscp.c
xt_esp.c
xt_hashlimit.c
xt_helper.c
xt_hl.c
xt_HL.c
xt_IDLETIMER.c
xt_iprange.c
xt_ipvs.c	netfilter: remove duplicated include	2010-10-04 21:00:42 +02:00
xt_LED.c
xt_length.c
xt_limit.c
xt_mac.c
xt_mark.c
xt_multiport.c
xt_NFLOG.c
xt_NFQUEUE.c
xt_NOTRACK.c
xt_osf.c
xt_owner.c
xt_physdev.c
xt_pkttype.c
xt_policy.c
xt_quota.c	xt_quota: report initial quota value instead of current value to userspace	2010-07-23 14:07:47 +02:00
xt_RATEEST.c
xt_rateest.c
xt_realm.c	netfilter: xtables: deconstify struct xt_action_param for matches	2010-05-11 18:33:37 +02:00
xt_recent.c	llseek: automatically add .llseek fop	2010-10-15 15:53:27 +02:00
xt_repldata.h
xt_sctp.c
xt_SECMARK.c	secmark: make secmark object handling generic	2010-10-21 10:12:48 +11:00
xt_socket.c	tproxy: added IPv6 support to the socket match	2010-10-21 16:19:42 +02:00
xt_state.c
xt_statistic.c	netfilter: xt_statistic: remove nth_lock spinlock	2010-06-01 12:00:41 +02:00
xt_string.c
xt_TCPMSS.c	tcp: unify tcp flag macros	2010-06-15 11:56:19 -07:00
xt_tcpmss.c	netfilter: xtables: change hotdrop pointer to direct modification	2010-05-11 18:35:27 +02:00
xt_TCPOPTSTRIP.c
xt_tcpudp.c
xt_TEE.c
xt_time.c
xt_TPROXY.c	tproxy: use the interface primary IP address as a default value for --on-ip	2010-10-21 16:21:10 +02:00
xt_TRACE.c
xt_u32.c