linux/arch/arm/mach-pnx4008
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 ARM: 6484/1: fix compile warning in mm/init.c 2010-11-21 22:05:56 +00:00
Makefile i2c: New Philips PNX bus driver 2006-12-10 21:21:29 +01:00
Makefile.boot [ARM] 3466/1: [2/3] Support for Philips PNX4008 platform: chip support 2006-06-18 16:16:55 +01:00
clock.c ARM: 6483/1: arm & sh: factorised duplicated clkdev.c 2010-11-26 10:51:04 +00:00
clock.h ARM: PNX4008: provide clock enable/disable methods and initialization 2010-02-12 17:32:36 +00:00
core.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
dma.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
gpio.c [ARM] fix pnx4008 2009-01-08 16:29:43 +00:00
i2c.c ARM: PNX4008: move i2c_adapter structure inside the drivers private data 2010-02-12 17:32:41 +00:00
irq.c [ARM] Convert asm/io.h to linux/io.h 2008-09-06 12:10:45 +01:00
pm.c suspend: constify platform_suspend_ops 2010-11-16 14:14:02 +01:00
serial.c [ARM] Convert asm/io.h to linux/io.h 2008-09-06 12:10:45 +01:00
sleep.S [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
time.c ARM: PNX4008: remove platform definitions from mach/timex.h 2010-02-12 17:32:39 +00:00
time.h ARM: PNX4008: remove platform definitions from mach/timex.h 2010-02-12 17:32:39 +00:00