linux/arch/arm/mach-bcmring
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
..
csp tree-wide: fix comment/printk typos 2010-11-01 15:38:34 -04:00
include Fix spelling mistakes in comments 2011-01-03 13:51:58 +01:00
arch.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
clock.c ARM: 6483/1: arm & sh: factorised duplicated clkdev.c 2010-11-26 10:51:04 +00:00
clock.h ARM: 5644/1: add bcmring core.c, clock.c, clock.h 2009-08-15 16:01:38 +01:00
core.c Merge branch 'misc' into devel 2011-01-06 22:32:52 +00:00
core.h
dma.c tree-wide: fix comment/printk typos 2010-11-01 15:38:34 -04:00
dma_device.c ARM: 5647/1: bcmring: add bcmring dma.h and dma_device.c 2009-08-15 16:01:40 +01:00
irq.c genirq: Cleanup irq_chip->typename leftovers 2010-09-23 19:12:26 +02:00
Kconfig ARM: 5642/1: bcmring: add Makefile/Kconfig/Makefile.boot in mach-bcmring 2009-08-15 16:01:50 +01:00
Makefile ARM: 5642/1: bcmring: add Makefile/Kconfig/Makefile.boot in mach-bcmring 2009-08-15 16:01:50 +01:00
Makefile.boot ARM: 5642/1: bcmring: add Makefile/Kconfig/Makefile.boot in mach-bcmring 2009-08-15 16:01:50 +01:00
mm.c ARM: 5646/1: bcmring: add mach-bcmring/mm.c and memory headers 2009-08-15 16:01:40 +01:00
timer.c ARM: 5649/1: bcmring: add bcmring timer function 2009-08-15 16:01:41 +01:00