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

..

chips

Update broken web addresses in the kernel.

2010-10-18 11:03:14 +02:00

devices

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2010-10-24 13:41:39 -07:00

lpddr

mtd: change struct flchip_shared spinlock locking into mutex

2010-08-06 09:22:16 +01:00

maps

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2010-10-24 13:41:39 -07:00

nand

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2010-10-24 13:41:39 -07:00

onenand

mtd: OneNAND: Fix loop hang when DMA error at Samsung SoCs

2010-09-13 08:49:45 +01:00

tests

mtd: tests: return -1 if verify failed

2010-08-02 09:06:20 +01:00

ubi

Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6

2010-10-22 16:34:23 -07: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

mtd: update description on sm_ftl

2010-08-06 09:21:40 +01: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

block: autoconvert trivial BKL users to private mutex

2010-10-05 15:01:10 +02:00

mtdblock_ro.c

mtd: Update copyright notices

2010-08-08 20:58:20 +01:00

mtdblock.c

mtd: Update copyright notices

2010-08-08 20:58:20 +01:00

mtdchar.c

mtd: autoconvert trivial BKL users to private mutex

2010-09-15 21:00:46 +02: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

mtd: Update copyright notices

2010-08-08 20:58:20 +01:00

mtdpart.c

mtd: Remove obsolete <mtd/compatmac.h> include

2010-08-08 21:19:42 +01:00

mtdsuper.c

mtd: Update copyright notices

2010-08-08 20:58:20 +01: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: Update copyright notices

2010-08-08 20:58:20 +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: Add new SmartMedia/xD FTL

2010-02-26 19:06:50 +00:00

ssfdc.c

mtd: Update copyright notices

2010-08-08 20:58:20 +01:00