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
..
chips	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git	2010-10-30 12:35:11 +01:00
devices	mtd: fix build error in m25p80.c	2010-10-30 12:46:08 +01:00
lpddr	mtd: change struct flchip_shared spinlock locking into mutex	2010-08-06 09:22:16 +01:00
maps	of: make drivers depend on CONFIG_OF instead of CONFIG_PPC_OF	2011-01-03 14:08:18 -07:00
nand	Merge branch 'master' into for-next	2010-12-22 18:57:02 +01:00
onenand	OMAP2/3: OneNAND: add 104MHz support	2010-12-21 12:05:34 -08:00
tests	mtd: tests: return -1 if verify failed	2010-08-02 09:06:20 +01:00
ubi	UBI: fix corrupted PEB detection for NOR flash	2010-12-03 15:49:21 +02:00
afs.c	mtd: Update copyright notices	2010-08-08 20:58:20 +01:00
ar7part.c	[MTD] mtdpart: Make all partition parsers return allocated array	2009-03-20 18:55:17 +00:00
cmdlinepart.c	mtd: Update copyright notices	2010-08-08 20:58:20 +01:00
ftl.c	Update broken web addresses in the kernel.	2010-10-18 11:03:14 +02:00
inftlcore.c	mtd: Update copyright notices	2010-08-08 20:58:20 +01:00
inftlmount.c	mtd: Remove obsolete <mtd/compatmac.h> include	2010-08-08 21:19:42 +01:00
Kconfig	of: make drivers depend on CONFIG_OF instead of CONFIG_PPC_OF	2011-01-03 14:08:18 -07:00
Makefile	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2010-05-10 14:32:46 +01:00
mtd_blkdevs.c	mtd: Remove redundant mutex from mtd_blkdevs.c	2010-10-30 12:39:21 +01:00
mtdblock.c	mtd: Update copyright notices	2010-08-08 20:58:20 +01:00
mtdblock_ro.c	mtd: Update copyright notices	2010-08-08 20:58:20 +01:00
mtdchar.c	fs: scale mntget/mntput	2011-01-07 17:50:33 +11:00
mtdconcat.c	mtd: Update copyright notices	2010-08-08 20:58:20 +01:00
mtdcore.c	mtd: Remove obsolete <mtd/compatmac.h> include	2010-08-08 21:19:42 +01:00
mtdcore.h	mtd: Replace static array of devices with an idr structure	2010-02-25 11:55:14 +00:00
mtdoops.c	kmsg_dump: constrain mtdoops and ramoops to perform their actions only for KMSG_DUMP_PANIC	2011-01-13 08:03:07 -08:00
mtdpart.c	mtd: prepare partition add and del functions for ioctl requests	2010-10-25 00:47:37 +01:00
mtdsuper.c	convert get_sb_mtd() users to ->mount()	2010-10-29 04:16:26 -04:00
nftlcore.c	mtd: Update copyright notices	2010-08-08 20:58:20 +01:00
nftlmount.c	mtd: Update copyright notices	2010-08-08 20:58:20 +01:00
ofpart.c	mtd: Fix endianness issues from device tree	2010-10-25 00:55:56 +01:00
redboot.c	mtd: Update copyright notices	2010-08-08 20:58:20 +01:00
rfd_ftl.c	mtd: Update copyright notices	2010-08-08 20:58:20 +01:00
sm_ftl.c	bitops: rename for_each_bit() to for_each_set_bit(): mtd	2010-04-08 09:42:41 +01:00
sm_ftl.h	mtd: sm_ftl: cosmetic, use bool when possible	2010-10-25 01:33:08 +01:00
ssfdc.c	mtd: Update copyright notices	2010-08-08 20:58:20 +01:00