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
..
alchemy	Merge branch 'master' into for-next	2010-12-22 18:57:02 +01:00
ar7	MIPS: AR7: Fix loops per jiffies on TNETD7200 devices	2010-12-16 18:10:56 +00:00
bcm47xx	MIPS: BCM47xx: Swap serial console if ttyS1 was specified.	2010-12-16 18:11:00 +00:00
bcm63xx	MIPS: Decouple BMIPS CPU support from bcm47xx/bcm63xx SoC code	2010-10-29 19:08:50 +01:00
boot	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus	2010-10-18 13:10:36 -07:00
cavium-octeon	MIPS: Add platform device and Kconfig for Octeon USB EHCI / OHCI	2010-10-29 19:08:45 +01:00
cobalt	MIPS: Move Cobalt Makefile parts to their own Platform file	2010-08-05 13:25:47 +01:00
configs	defconfig reduction	2010-08-14 22:26:53 +02:00
dec	set_rtc_mmss: show warning message only once	2011-01-13 08:03:07 -08:00
emma	MIPS: Ritually kill stupid printk.	2010-08-05 13:26:27 +01:00
fw	MIPS: IP22: Remove an unused function	2009-12-17 01:56:56 +00:00
include/asm	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-01-13 10:05:56 -08:00
jazz	MIPS: Add missing #inclusions of <linux/irq.h>	2010-10-07 14:08:54 +01:00
jz4740	Merge branch 'master' into for-next	2010-12-22 18:57:02 +01:00
kernel	Merge commit 'v2.6.37-rc7' into perf/core	2010-12-22 11:53:23 +01:00
lasat	MIPS: Lasat: Migrate to new platform makefile style.	2010-08-05 13:25:53 +01:00
lib	MIPS: Separate two consecutive loads in memset.S	2010-12-16 18:10:57 +00:00
loongson	Merge branch 'master' into for-next	2010-12-22 18:57:02 +01:00
math-emu	MIPS: Send proper signal and siginfo on FP emulator faults.	2010-12-16 18:10:57 +00:00
mipssim	MIPS: MIPSsim: Migrate to new Platform file	2010-08-05 13:25:45 +01:00
mm	MIPS: Fix build errors in sc-mips.c	2010-12-17 19:44:35 +00:00
mti-malta	tree-wide: fix comment/printk typos	2010-11-01 15:38:34 -04:00
nxp/pnx8550/common	MIPS: PNX8550: Move code one directory level up.	2010-08-05 13:25:56 +01:00
oprofile	MIPS: Oprofile: Fixup of loongson2_exit()	2010-07-05 17:17:31 +01:00
pci	tree-wide: fix comment/printk typos	2010-11-01 15:38:34 -04:00
pmc-sierra	MIPS: LD/SD o32 macro GAS fix update	2010-12-16 18:11:01 +00:00
pnx833x	MIPS: Fix gen_nand probe structures contents	2010-08-12 12:22:49 +01:00
pnx8550	MIPS: PNX8550: Sort out machine halt, restart and powerdown functions.	2010-10-04 18:33:57 +01:00
power	MIPS: Loongson: Change the Email address of Wu Zhangjin	2010-02-27 12:53:12 +01:00
powertv	tree-wide: fix comment/printk typos	2010-11-01 15:38:34 -04:00
rb532	MIPS: Add missing #inclusions of <linux/irq.h>	2010-10-07 14:08:54 +01:00
sgi-ip22	MIPS: IP22, IP28: Migrate to new platform makefile style.	2010-08-05 13:25:49 +01:00
sgi-ip27	MIPS: IP27: Migrate to new Platform file	2010-08-05 13:25:47 +01:00
sgi-ip32	MIPS: IP32: Migrate to new platform makefile style.	2010-08-05 13:25:50 +01:00
sibyte	MIPS: Swarm: Fix typo in symbol name: RTC_M4LT81 -> RTC_M41T81	2010-12-16 18:10:52 +00:00
sni	MIPS: Add missing #inclusions of <linux/irq.h>	2010-10-07 14:08:54 +01:00
txx9	tree-wide: fix comment/printk typos	2010-11-01 15:38:34 -04:00
vr41xx	MIPS: Add missing #inclusions of <linux/irq.h>	2010-10-07 14:08:54 +01:00
wrppmc	MIPS: WRPPMC: Migrate to new platform makefile style.	2010-08-05 13:25:51 +01:00
Kbuild	MIPS: Repair Kbuild make clean breakage.	2010-10-19 18:32:39 +01:00
Kbuild.platforms	MIPS: JZ4740: Add Kbuild files	2010-08-05 13:26:17 +01:00
Kconfig	of/flattree: Add Kconfig for EARLY_FLATTREE	2010-12-29 16:08:18 -07:00
Kconfig.debug	MIPS: IRQ: Add stackoverflow detection	2010-10-29 19:08:27 +01:00
Makefile	MIPS: Octeon: Apply CN63XXP1 errata workarounds.	2010-10-29 19:08:43 +01:00