linux/arch/arm/common
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
..
clkdev.c Merge branch 'devel-stable' into devel 2010-05-17 17:24:04 +01:00
dmabounce.c Merge branches 'at91', 'cache', 'cup', 'ep93xx', 'ixp4xx', 'nuc', 'pending-dma-streaming', 'u300' and 'umc' into devel 2010-02-25 22:06:43 +00:00
gic.c GIC: Dont disable INT in ack callback 2010-10-06 08:39:53 -07:00
icst.c Update broken web addresses in arch directory. 2010-10-18 11:03:21 +02:00
it8152.c arm: fix "arm: fix pci_set_consistent_dma_mask for dmabounce devices" 2010-09-22 17:22:38 -07:00
Kconfig Merge branches 'at91', 'bcmring', 'ep93xx', 'iop', 'misc', 'nomadik', 'omap', 'pxa', 'spear' and 'versatile' into devel 2010-05-17 11:53:39 +01:00
locomo.c [ARM] locomo: fix unpaired spin_lock_irqsave 2010-03-22 12:03:09 +08:00
Makefile Merge branches 'at91', 'bcmring', 'ep93xx', 'iop', 'misc', 'nomadik', 'omap', 'pxa', 'spear' and 'versatile' into devel 2010-05-17 11:53:39 +01:00
pl330.c ARM: 6367/1: PL330: Accept different revision 2010-10-11 22:58:48 +01:00
sa1111.c ARM: 6349/1: sa1111: move __sa1111_probe() to .devinit.text 2010-10-04 20:20:44 +01:00
scoop.c arm: scoop.c: remove C99 comments 2010-09-23 13:19:08 +02:00
sharpsl_param.c [ARM] 4733/1: export sharpsl_param 2008-10-03 10:18:35 +01:00
time-acorn.c [ARM] Convert asm/io.h to linux/io.h 2008-09-06 12:10:45 +01:00
uengine.c arm: uengine.c: remove C99 comments 2010-09-23 13:20:06 +02:00
via82c505.c [ARM] Convert asm/io.h to linux/io.h 2008-09-06 12:10:45 +01:00
vic.c ARM: 6025/1: vic: factor out common init code 2010-04-14 11:19:23 +01:00