linux/arch/arm/mach-u300
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
..
include/mach tree-wide: fix comment/printk typos 2010-11-01 15:38:34 -04:00
clock.c ARM: 6483/1: arm & sh: factorised duplicated clkdev.c 2010-11-26 10:51:04 +00:00
clock.h ARM: 6296/1: clock U300 intcon and timer properly 2010-08-10 22:10:55 +01:00
core.c ARM: platform data to use the FSMC NAND with the U300 2010-10-25 00:35:46 +01:00
dummyspichip.c spi/pl022: Add spi->mode support to AMBA SPI driver 2010-10-12 21:37:37 -06:00
gpio.c fix typos concerning "initiali[zs]e" 2010-06-16 18:05:05 +02:00
i2c.c ARM: AB3550 board configuration and irq for U300 2010-05-28 01:37:47 +02:00
i2c.h
Kconfig tree-wide: fix comment/printk typos 2010-11-01 15:38:34 -04:00
Makefile ARM: 5724/1: U300 AB3100 boardinfo v5 2009-10-19 17:10:09 +01:00
Makefile.boot
mmc.c ARM: 6306/1: fix inverted MMC card detect in U300 2010-08-10 22:10:54 +01:00
mmc.h
padmux.c
padmux.h
regulator.c ARM: 5724/1: U300 AB3100 boardinfo v5 2009-10-19 17:10:09 +01:00
spi.c spi/pl022: fix erroneous platform data in U300 2010-11-01 01:01:08 -04:00
spi.h
timer.c ARM: u300: convert sched_clock() to use new infrastructure 2010-12-22 22:44:47 +00:00
u300.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00