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

..

include/mach

arm: return both physical and virtual addresses from addruart

2010-10-20 00:27:33 -04:00

assabet.c

arm: remove machine_desc.io_pg_offst and .phys_io

2010-10-20 00:27:46 -04:00

badge4.c

arm: remove machine_desc.io_pg_offst and .phys_io

2010-10-20 00:27:46 -04:00

cerf.c

arm: remove machine_desc.io_pg_offst and .phys_io

2010-10-20 00:27:46 -04:00

clock.c

[ARM] sa1100: match clock by dev_name(dev)

2008-11-27 12:38:24 +00:00

collie.c

arm: remove machine_desc.io_pg_offst and .phys_io

2010-10-20 00:27:46 -04:00

cpu-sa1100.c

Update broken web addresses in arch directory.

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

cpu-sa1110.c

ARM: 6076/1: SA1100: add processor check to sa1110-cpufreq driver

2010-05-01 11:32:59 +01:00

dma.c

tree-wide: fix assorted typos all over the place

2009-12-04 15:39:55 +01:00

generic.c

ARM: fix sa1100 build

2009-12-13 19:38:08 +00:00

generic.h

ARM: Remove DISCONTIGMEM support

2010-07-16 10:57:35 +01:00

gpio.c

[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach

2008-08-07 09:55:48 +01:00

h3xxx.c

ARM: 5827/1: SA1100: h3100/h3600: emit messages on failed gpio_request

2009-12-06 16:52:58 +00:00

h3100.c

arm: remove machine_desc.io_pg_offst and .phys_io

2010-10-20 00:27:46 -04:00

h3600.c

arm: remove machine_desc.io_pg_offst and .phys_io

2010-10-20 00:27:46 -04:00

hackkit.c

arm: remove machine_desc.io_pg_offst and .phys_io

2010-10-20 00:27:46 -04:00

irq.c

[ARM] 5298/1: Drop desc_handle_irq()

2008-10-09 15:00:36 +01:00

jornada720_ssp.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

jornada720.c

arm: remove machine_desc.io_pg_offst and .phys_io

2010-10-20 00:27:46 -04:00

Kconfig

Update broken web addresses in arch directory.

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

lart.c

arm: remove machine_desc.io_pg_offst and .phys_io

2010-10-20 00:27:46 -04:00

leds-assabet.c

[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach

2008-08-07 09:55:48 +01:00

leds-badge4.c

[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach

2008-08-07 09:55:48 +01:00

leds-cerf.c

[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach

2008-08-07 09:55:48 +01:00

leds-hackkit.c

[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach

2008-08-07 09:55:48 +01:00

leds-lart.c

[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach

2008-08-07 09:55:48 +01:00

leds-simpad.c

[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach

2008-08-07 09:55:48 +01:00

leds.c

ARM: arch/arm/mach-sa1100/leds.c: Checkpatch cleanup

2010-05-24 20:40:11 +01:00

leds.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

Makefile

ARM: 5820/1: SA1100: h3100/h3600: split h3600.c

2009-12-06 16:52:56 +00:00

Makefile.boot

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

neponset.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

pleb.c

arm: remove machine_desc.io_pg_offst and .phys_io

2010-10-20 00:27:46 -04:00

pm.c

Nicolas Pitre has a new email address

2009-09-15 09:37:12 -07:00

shannon.c

arm: remove machine_desc.io_pg_offst and .phys_io

2010-10-20 00:27:46 -04:00

simpad.c

arm: remove machine_desc.io_pg_offst and .phys_io

2010-10-20 00:27:46 -04:00

sleep.S

[ARM] 5336/1: Formatting/Whitespace cleanups in mach-sa1100

2008-12-01 17:22:45 +00:00

ssp.c

[ARM] Convert asm/io.h to linux/io.h

2008-09-06 12:10:45 +01:00

time.c

arm/{pxa,sa1100,nomadik}: Don't disable irqs in set_next_event and set_mode

2010-01-22 17:04:52 +01:00