1
linux/drivers/mtd/devices
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
..
block2mtd.c 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
doc2000.c [MTD] we don't need no misc devices 2009-03-20 13:16:26 +00:00
doc2001.c [MTD] we don't need no misc devices 2009-03-20 13:16:26 +00:00
doc2001plus.c [MTD] we don't need no misc devices 2009-03-20 13:16:26 +00:00
docecc.c mtd: Remove obsolete <mtd/compatmac.h> include 2010-08-08 21:19:42 +01:00
docprobe.c mtd: Remove obsolete <mtd/compatmac.h> include 2010-08-08 21:19:42 +01:00
Kconfig Kconfig: Remove useless and sometimes wrong comments 2009-11-09 09:40:56 +01:00
lart.c Update broken web addresses in the kernel. 2010-10-18 11:03:14 +02:00
m25p80.c mtd/m25p80: fix test for end of loop 2010-08-12 12:31:39 +01:00
Makefile mtd: small typo in Makefile 2010-03-18 07:53:16 +00:00
ms02-nv.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
ms02-nv.h MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
mtd_dataflash.c mtd: dataflash: remove casts from void 2010-08-02 09:05:46 +01:00
mtdram.c mtd: Remove obsolete <mtd/compatmac.h> include 2010-08-08 21:19:42 +01:00
phram.c phram: cleanup error handling and associated messages 2009-09-19 13:11:12 -07:00
pmc551.c mtd: Remove obsolete <mtd/compatmac.h> include 2010-08-08 21:19:42 +01:00
slram.c tree-wide: fix assorted typos all over the place 2009-12-04 15:39:55 +01:00
sst25l.c mtd: sst25l: check for null consistently 2010-08-02 09:00:45 +01:00