Linus Torvalds 008d23e485 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: (43 commits) Documentation/trace/events.txt: Remove obsolete sched_signal_send. writeback: fix global_dirty_limits comment runtime -> real-time ppc: fix comment typo singal -> signal drivers: fix comment typo diable -> disable. m68k: fix comment typo diable -> disable. wireless: comment typo fix diable -> disable. media: comment typo fix diable -> disable. remove doc for obsolete dynamic-printk kernel-parameter remove extraneous 'is' from Documentation/iostats.txt Fix spelling milisec -> ms in snd_ps3 module parameter description Fix spelling mistakes in comments Revert conflicting V4L changes i7core_edac: fix typos in comments mm/rmap.c: fix comment sound, ca0106: Fix assignment to 'channel'. hrtimer: fix a typo in comment init/Kconfig: fix typo anon_inodes: fix wrong function name in comment fix comment typos concerning "consistent" poll: fix a typo in comment ... Fix up trivial conflicts in: - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c) - fs/ext4/ext4.h Also fix missed 'diabled' typo in drivers/net/bnx2x/bnx2x.h while at it.		2011-01-13 10:05:56 -08:00
..
ccids	dccp ccid-2: Separate option parsing from CCID processing	2010-11-15 07:12:01 +01:00
ackvec.c	dccp ccid-2: whitespace fix-up	2010-11-18 09:37:07 -08:00
ackvec.h	dccp ccid-2: Separate option parsing from CCID processing	2010-11-15 07:12:01 +01:00
ccid.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
ccid.h	dccp: Return-value convention of hc_tx_send_packet()	2010-10-28 10:27:00 -07:00
dccp.h	dccp: fix bug in updating the GSR	2011-01-07 12:22:43 +01:00
diag.c	dccp_diag: LISTEN sockets don't have CCIDs	2008-12-17 16:08:01 -08:00
feat.c	dccp: Kill dead code and add static markers.	2010-10-06 23:12:07 -07:00
feat.h	dccp: Kill dead code and add static markers.	2010-10-06 23:12:07 -07:00
input.c	dccp: fix return value for sequence-invalid packets	2011-01-07 12:22:43 +01:00
ipv4.c	net: use the macros defined for the members of flowi	2010-11-17 12:27:45 -08:00
ipv6.c	tproxy: fix hash locking issue when using port redirection in __inet_inherit_port()	2010-10-21 13:06:43 +02:00
ipv6.h	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
Kconfig	Docs/Kconfig: Update: osdl.org -> linuxfoundation.org	2010-11-15 23:50:13 +01:00
Makefile	dccp: Policy-based packet dequeueing infrastructure	2010-12-07 13:47:12 +01:00
minisocks.c	dccp: fix the adjustments to AWL and SWL	2010-10-12 06:57:40 +02:00
options.c	dccp ccid-2: Separate option parsing from CCID processing	2010-11-15 07:12:01 +01:00
output.c	dccp: Policy-based packet dequeueing infrastructure	2010-12-07 13:47:12 +01:00
probe.c	llseek: automatically add .llseek fop	2010-10-15 15:53:27 +02:00
proto.c	dccp qpolicy: Parameter checking of cmsg qpolicy parameters	2010-12-07 13:47:12 +01:00
qpolicy.c	dccp qpolicy: Parameter checking of cmsg qpolicy parameters	2010-12-07 13:47:12 +01:00
sysctl.c	dccp: make upper bound for seq_window consistent on 32/64 bit	2011-01-07 12:22:44 +01:00
timer.c	dccp: Refine the wait-for-ccid mechanism	2010-10-28 10:27:01 -07:00