Linus Torvalds 98793265b4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial ... * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (53 commits) Kconfig: acpi: Fix typo in comment. misc latin1 to utf8 conversions devres: Fix a typo in devm_kfree comment btrfs: free-space-cache.c: remove extra semicolon. fat: Spelling s/obsolate/obsolete/g SCSI, pmcraid: Fix spelling error in a pmcraid_err() call tools/power turbostat: update fields in manpage mac80211: drop spelling fix types.h: fix comment spelling for 'architectures' typo fixes: aera -> area, exntension -> extension devices.txt: Fix typo of 'VMware'. sis900: Fix enum typo 'sis900_rx_bufer_status' decompress_bunzip2: remove invalid vi modeline treewide: Fix comment and string typo 'bufer' hyper-v: Update MAINTAINERS treewide: Fix typos in various parts of the kernel, and fix some comments. clockevents: drop unknown Kconfig symbol GENERIC_CLOCKEVENTS_MIGR gpio: Kconfig: drop unknown symbol 'CS5535_GPIO' leds: Kconfig: Fix typo 'D2NET_V2' sound: Kconfig: drop unknown symbol ARCH_CLPS7500 ... Fix up trivial conflicts in arch/powerpc/platforms/40x/Kconfig (some new kconfig additions, close to removed commented-out old ones)		2012-01-08 13:21:22 -08:00
..
ipset	net:netfilter: use IS_ENABLED	2011-12-16 15:49:52 -05:00
ipvs	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-01-08 13:21:22 -08:00
Kconfig	netfilter: Kconfig: fix unmet xt_nfacct dependencies	2011-12-29 14:39:19 -05:00
Makefile	netfilter: xtables: move ipt_ecn to xt_ecn	2011-12-27 20:31:31 +01:00
core.c	net:netfilter: use IS_ENABLED	2011-12-16 15:49:52 -05:00
nf_conntrack_acct.c	Merge branch 'nf-next' of git://1984.lsi.us.es/net-next	2011-12-25 02:21:45 -05:00
nf_conntrack_amanda.c	…
nf_conntrack_broadcast.c	…
nf_conntrack_core.c	Merge branch 'nf-next' of git://1984.lsi.us.es/net-next	2011-12-25 02:21:45 -05:00
nf_conntrack_ecache.c	netfilter: nf_conntrack: make event callback registration per-netns	2011-11-22 00:34:47 +01:00
nf_conntrack_expect.c	netfilter: provide config option to disable ancient procfs parts	2011-12-27 20:45:28 +01:00
nf_conntrack_extend.c	…
nf_conntrack_ftp.c	module_param: make bool parameters really bool (net & drivers/net)	2011-12-19 22:27:29 -05:00
nf_conntrack_h323_asn1.c	…
nf_conntrack_h323_main.c	module_param: make bool parameters really bool (net & drivers/net)	2011-12-19 22:27:29 -05:00
nf_conntrack_h323_types.c	…
nf_conntrack_helper.c	netfilter: rework user-space expectation helper support	2011-12-23 14:36:39 +01:00
nf_conntrack_irc.c	…
nf_conntrack_l3proto_generic.c	…
nf_conntrack_netbios_ns.c	…
nf_conntrack_netlink.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-01-02 18:56:49 -05:00
nf_conntrack_pptp.c	…
nf_conntrack_proto.c	…
nf_conntrack_proto_dccp.c	net:netfilter: use IS_ENABLED	2011-12-16 15:49:52 -05:00
nf_conntrack_proto_generic.c	…
nf_conntrack_proto_gre.c	net:netfilter: use IS_ENABLED	2011-12-16 15:49:52 -05:00
nf_conntrack_proto_sctp.c	net:netfilter: use IS_ENABLED	2011-12-16 15:49:52 -05:00
nf_conntrack_proto_tcp.c	net:netfilter: use IS_ENABLED	2011-12-16 15:49:52 -05:00
nf_conntrack_proto_udp.c	net:netfilter: use IS_ENABLED	2011-12-16 15:49:52 -05:00
nf_conntrack_proto_udplite.c	net:netfilter: use IS_ENABLED	2011-12-16 15:49:52 -05:00
nf_conntrack_sane.c	…
nf_conntrack_sip.c	…
nf_conntrack_snmp.c	…
nf_conntrack_standalone.c	netfilter: provide config option to disable ancient procfs parts	2011-12-27 20:45:28 +01:00
nf_conntrack_tftp.c	…
nf_conntrack_timestamp.c	module_param: make bool parameters really bool (net & drivers/net)	2011-12-19 22:27:29 -05:00
nf_internals.h	…
nf_log.c	…
nf_queue.c	…
nf_sockopt.c	…
nf_tproxy_core.c	…
nfnetlink.c	…
nfnetlink_acct.c	netfilter: nfnetlink_acct: fix nfnl_acct_get operation	2012-01-01 16:36:08 +01:00
nfnetlink_log.c	netfilter: Remove unnecessary OOM logging messages	2011-11-01 09:19:49 +01:00
nfnetlink_queue.c	…
x_tables.c	net: Fix files explicitly needing to include module.h	2011-10-31 19:30:28 -04:00
xt_AUDIT.c	ipv6: Add fragment reporting to ipv6_skip_exthdr().	2011-12-03 09:35:10 -08:00
xt_CHECKSUM.c	…
xt_CLASSIFY.c	…
xt_CONNSECMARK.c	…
xt_CT.c	netfilter: rework user-space expectation helper support	2011-12-23 14:36:39 +01:00
xt_DSCP.c	…
xt_HL.c	…
xt_IDLETIMER.c	netfilter: Remove unnecessary OOM logging messages	2011-11-01 09:19:49 +01:00
xt_LED.c	…
xt_NFLOG.c	…
xt_NFQUEUE.c	net:netfilter: use IS_ENABLED	2011-12-16 15:49:52 -05:00
xt_NOTRACK.c	…
xt_RATEEST.c	…
xt_SECMARK.c	…
xt_TCPMSS.c	net:netfilter: use IS_ENABLED	2011-12-16 15:49:52 -05:00
xt_TCPOPTSTRIP.c	net:netfilter: use IS_ENABLED	2011-12-16 15:49:52 -05:00
xt_TEE.c	net:netfilter: use IS_ENABLED	2011-12-16 15:49:52 -05:00
xt_TPROXY.c	net:netfilter: use IS_ENABLED	2011-12-16 15:49:52 -05:00
xt_TRACE.c	…
xt_addrtype.c	net:netfilter: use IS_ENABLED	2011-12-16 15:49:52 -05:00
xt_cluster.c	…
xt_comment.c	…
xt_connbytes.c	Merge branch 'nf-next' of git://1984.lsi.us.es/net-next	2011-12-25 02:21:45 -05:00
xt_connlimit.c	…
xt_connmark.c	…
xt_conntrack.c	…
xt_cpu.c	…
xt_dccp.c	…
xt_devgroup.c	…
xt_dscp.c	…
xt_ecn.c	netfilter: xtables: collapse conditions in xt_ecn	2011-12-27 20:45:25 +01:00
xt_esp.c	…
xt_hashlimit.c	net:netfilter: use IS_ENABLED	2011-12-16 15:49:52 -05:00
xt_helper.c	…
xt_hl.c	…
xt_iprange.c	…
xt_ipvs.c	…
xt_length.c	…
xt_limit.c	…
xt_mac.c	…
xt_mark.c	…
xt_multiport.c	…
xt_nfacct.c	netfilter: xtables: add nfacct match to support extended accounting	2011-12-25 02:43:17 +01:00
xt_osf.c	…
xt_owner.c	…
xt_physdev.c	…
xt_pkttype.c	…
xt_policy.c	…
xt_quota.c	net: Fix files explicitly needing to include module.h	2011-10-31 19:30:28 -04:00
xt_rateest.c	…
xt_realm.c	…
xt_recent.c	…
xt_repldata.h	…
xt_sctp.c	…
xt_set.c	…
xt_socket.c	net:netfilter: use IS_ENABLED	2011-12-16 15:49:52 -05:00
xt_state.c	…
xt_statistic.c	net: Fix files explicitly needing to include module.h	2011-10-31 19:30:28 -04:00
xt_string.c	…
xt_tcpmss.c	…
xt_tcpudp.c	…
xt_time.c	…
xt_u32.c	…