OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
linux/arch/arm/plat-mxc
History
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
..
devices ARM i.MX53: Make MX53 EVK bootable 2011-01-04 12:00:23 +01:00
include/mach Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-01-13 10:05:56 -08:00
3ds_debugboard.c mxc: add common debug board for 3-stack platforms 2010-07-26 14:29:19 +02:00
Kconfig ARM i.MX51: Make CONFIG_MXC_TZIC an invisible option 2010-11-24 10:08:59 +01:00
Makefile mx51: support FIQ on TZIC, revised 2010-12-14 09:54:37 +01:00
audmux-v1.c ARM: mxc: remove paragraphs with old address of the FSF 2010-06-30 09:00:28 +02:00
audmux-v2.c ARM: imx: use SOC_IMX25 instead of ARCH_MX25 for multi-SoC 2010-11-19 21:54:34 +01:00
avic.c mx51: support FIQ on TZIC, revised 2010-12-14 09:54:37 +01:00
clock.c arm: mxc: utilise usecount field in clock operations 2010-07-26 14:17:57 +02:00
cpu.c [ARM] MXC: add cpu_is_ macros 2009-03-13 10:34:26 +01:00
cpufreq.c Fix imx cpufreq driver as module 2010-12-14 09:54:38 +01:00
devices.c ARM: imx: allow specifying a dma mask when creating a platform device 2010-11-17 10:01:21 +01:00
ehci.c MX51: Add support for usb host 2 2011-01-03 10:20:23 +01:00
epit.c ARM: mxc: update clock source registration 2010-12-22 22:44:39 +00:00
gpio.c arm: mx50: add core functions support except clock 2011-01-03 09:39:29 +01:00
iomux-v1.c arm/imx/iomux-v1: check for invalid modes in mxc_gpio_mode 2010-02-24 10:07:16 +01:00
iomux-v3.c MXC IOMUX-V3 replace struct pad_desc with bitmapped cookie (step 2) 2010-12-15 12:42:49 +01:00
iram_alloc.c ARM: imx: Add iram allocator functions 2010-10-19 18:44:57 +02:00
irq-common.c mx51: support FIQ on TZIC, revised 2010-12-14 09:54:37 +01:00
irq-common.h mx51: support FIQ on TZIC, revised 2010-12-14 09:54:37 +01:00
pwm.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
ssi-fiq-ksym.c ASoC: Add a new imx-ssi sound driver 2010-01-17 11:09:46 +00:00
ssi-fiq.S ASoC: Add a new imx-ssi sound driver 2010-01-17 11:09:46 +00:00
system.c watchdog: imx: use clk_get to acquire the watchdog clock 2010-12-14 09:54:19 +01:00
time.c ARM: mxc: update clock source registration 2010-12-22 22:44:39 +00:00
tzic.c mx51: support FIQ on TZIC, revised 2010-12-14 09:54:37 +01:00
ulpi.c MXC: Add support for ULPI Viewports 2009-11-14 10:29:15 +01:00