1
linux/arch/arm/mach-imx
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 dmaengine: Add Freescale i.MX SDMA support 2010-10-05 15:49:26 -07:00
clock-imx1.c ARM: 6483/1: arm & sh: factorised duplicated clkdev.c 2010-11-26 10:51:04 +00:00
clock-imx21.c Merge branch 'devel-stable' into devel 2011-01-06 22:33:32 +00:00
clock-imx25.c Merge branch 'devel-stable' into devel 2011-01-06 22:33:32 +00:00
clock-imx27.c Merge branch 'devel-stable' into devel 2011-01-06 22:33:32 +00:00
cpu-imx27.c ARM: imx: Get the silicon version from the IIM module 2010-11-28 19:51:47 +01:00
devices-imx1.h ARM: imx: fix name of macros to add imx-i2c devices 2010-10-01 09:32:09 +02:00
devices-imx21.h ARM: imx: dynamically allocate imx21-hcd devices 2010-11-17 10:01:33 +01:00
devices-imx25.h Merge commit 'v2.6.37-rc4' into imx-for-2.6.38 2010-12-06 09:36:17 +01:00
devices-imx27.h ARM: imx: dynamically allocate imx-keypad devices 2010-11-17 10:01:32 +01:00
dma-v1.c arm: dma: check clk_get() result 2010-12-03 11:05:12 +01:00
eukrea_mbimx27-baseboard.c Merge commit 'v2.6.37-rc4' into imx-for-2.6.38 2010-12-06 09:36:17 +01:00
eukrea_mbimxsd25-baseboard.c ARM: i.MX IOMUX-V3 replace struct pad_desc with bitmapped cookie 2010-11-24 09:56:58 +01:00
Kconfig ARM: imx/mx27_3ds: Add PMIC support 2011-01-03 15:11:20 +01:00
mach-cpuimx27.c ARM: imx: remove now empty devices.h 2010-11-17 10:01:34 +01:00
mach-eukrea_cpuimx25.c ARM: i.MX IOMUX-V3 replace struct pad_desc with bitmapped cookie 2010-11-24 09:56:58 +01:00
mach-imx27_visstrim_m10.c ARM: imx: remove now empty devices.h 2010-11-17 10:01:34 +01:00
mach-imx27lite.c ARM: imx: remove now empty devices.h 2010-11-17 10:01:34 +01:00
mach-mx1ads.c ARM: imx: remove now empty devices.h 2010-11-17 10:01:34 +01:00
mach-mx21ads.c ARM: imx: remove now empty devices.h 2010-11-17 10:01:34 +01:00
mach-mx25_3ds.c ARM: imx/mx25_3ds: Add USB support 2011-01-03 10:17:12 +01:00
mach-mx27_3ds.c ARM: imx/mx27_3ds: Add PMIC support 2011-01-03 15:11:20 +01:00
mach-mx27ads.c ARM: imx: remove now empty devices.h 2010-11-17 10:01:34 +01:00
mach-mxt_td60.c ARM: imx: remove now empty devices.h 2010-11-17 10:01:34 +01:00
mach-pca100.c ARM: imx: remove now empty devices.h 2010-11-17 10:01:34 +01:00
mach-pcm038.c ARM: imx: remove now empty devices.h 2010-11-17 10:01:34 +01:00
mach-scb9328.c ARM: imx: remove now empty devices.h 2010-11-17 10:01:34 +01:00
Makefile ARM: imx: move mx25 support to mach-imx 2010-11-19 21:53:49 +01:00
Makefile.boot ARM: imx: move mx25 support to mach-imx 2010-11-19 21:53:49 +01:00
mm-imx1.c ARM: imx: use MXxy_IO_P2V macros to setup static mappings 2010-11-17 08:58:09 +01:00
mm-imx21.c ARM: imx: use MXxy_IO_P2V macros to setup static mappings 2010-11-17 08:58:09 +01:00
mm-imx25.c ARM: imx: move mx25 support to mach-imx 2010-11-19 21:53:49 +01:00
mm-imx27.c ARM: imx: use MXxy_IO_P2V macros to setup static mappings 2010-11-17 08:58:09 +01:00
mx1-camera-fiq-ksym.c ARM: imx: move mx1 support to mach-imx 2010-06-30 08:59:44 +02:00
mx1-camera-fiq.S ARM: imx: move mx1 support to mach-imx 2010-06-30 08:59:44 +02:00
pcm970-baseboard.c ARM: imx: remove now empty devices.h 2010-11-17 10:01:34 +01:00
pm-imx27.c Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-01-13 10:05:56 -08:00