kernel-fxtec-pro1x/arch/arm/plat-mxc/include/mach
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
..
3ds_debugboard.h
audmux.h
board-mx31ads.h Fixing ethernet driver compilation error for i.MX31 ADS board 2010-10-19 18:45:01 +02:00
board-mx31lilly.h
board-mx31lite.h
board-mx31moboard.h
board-pcm038.h
clkdev.h
clock.h
common.h arm: mx50: add core functions support except clock 2011-01-03 09:39:29 +01:00
debug-macro.S ARM: imx/debug-macro: rework using the new io mapping macro 2010-11-17 08:58:11 +01:00
devices-common.h ARM: mx5: add support for the two watchdog modules 2010-12-07 20:03:11 +01:00
dma.h dmaengine: Add Freescale i.MX SDMA support 2010-10-05 15:49:26 -07:00
entry-macro.S mx51: support FIQ on TZIC, revised 2010-12-14 09:54:37 +01:00
esdhc.h arm: imx: add generic esdhc device 2010-10-11 15:22:05 +02:00
eukrea-baseboards.h mx5: add cpuimx51sd module and its baseboard 2010-10-19 18:45:00 +02:00
gpio.h iMX51: introduce IMX_GPIO_NR 2010-12-03 11:05:16 +01:00
hardware.h arm: mx50: add core functions support except clock 2011-01-03 09:39:29 +01:00
i2c.h
iim.h
imx-uart.h
imxfb.h ARM: imx: dynamically register imx-fb devices 2010-11-17 10:01:27 +01:00
io.h
iomux-mx1.h
iomux-mx2x.h
iomux-mx3.h
iomux-mx21.h
iomux-mx25.h
iomux-mx27.h
iomux-mx35.h
iomux-mx50.h arm: mx50: add core functions support except clock 2011-01-03 09:39:29 +01:00
iomux-mx51.h ARM i.MX51: Full iomux support 2010-12-15 14:42:23 +01:00
iomux-mx53.h ARM i.MX53: Make MX53 EVK bootable 2011-01-04 12:00:23 +01:00
iomux-mxc91231.h
iomux-v1.h
iomux-v3.h ARM i.MX51: Full iomux support 2010-12-15 14:42:23 +01:00
iomux.h
ipu.h
iram.h ARM: imx: Add iram allocator functions 2010-10-19 18:44:57 +02:00
irqs.h Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-01-13 10:05:56 -08:00
memory.h arm: mx50: add core functions support except clock 2011-01-03 09:39:29 +01:00
mmc.h
mx1.h ARM: mx25: move registration of gpios to plat-mxc/gpio.c 2010-11-17 10:01:38 +01:00
mx1_camera.h
mx2_cam.h
mx2x.h ARM: imx: remove deprecated symbols as all users are gone now 2010-11-17 08:58:12 +01:00
mx3_camera.h
mx3fb.h
mx3x.h ARM: imx: Get the silicon version from the IIM module 2010-11-28 19:51:47 +01:00
mx21-usbhost.h
mx21.h ARM: mx25: move registration of gpios to plat-mxc/gpio.c 2010-11-17 10:01:38 +01:00
mx25.h ARM: mx25: fix offset for usb host controller 2010-12-03 11:05:10 +01:00
mx27.h ARM: imx: Get the silicon version from the IIM module 2010-11-28 19:51:47 +01:00
mx31.h ARM: imx: Get the silicon version from the IIM module 2010-11-28 19:51:47 +01:00
mx35.h ARM: imx: Get the silicon version from the IIM module 2010-11-28 19:51:47 +01:00
mx50.h arm: mx50: add core functions support except clock 2011-01-03 09:39:29 +01:00
mx51.h ARM i.MX51: rename IPU irqs 2011-01-03 16:31:03 +01:00
mx53.h ARM: imx: Add core definitions for MX53 2010-11-24 10:09:04 +01:00
mxc.h arm: mx50: add core functions support except clock 2011-01-03 09:39:29 +01:00
mxc91231.h ARM: imx: change static io mapping to use a function 2010-11-17 08:58:11 +01:00
mxc_ehci.h MX51: Add support for usb host 2 2011-01-03 10:20:23 +01:00
mxc_nand.h
sdma.h dmaengine i.MX SDMA: Allow to run without firmware 2010-12-03 11:04:54 +01:00
spi.h
ssi.h
system.h i.MX31 and i.MX35 : fix errate TLSbo65953 and ENGcm09472 2010-10-19 18:44:58 +02:00
timex.h
ulpi.h
uncompress.h ARM i.MX53: Make MX53 EVK bootable 2011-01-04 12:00:23 +01:00
usb.h
vmalloc.h