leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6da5ce1728
linux/arch/arm/mach-mxs/devices
History
Linus Torvalds dd58ecba48 Merge branch 'next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 
* 'next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc: (35 commits)
  ARM: msm: platsmp: determine number of CPU cores at boot time
  ARM: Tegra: Seaboard: Fix I2C bus numbering for ADT7461
  ARM: Tegra: Trimslice: Tri-state DAP3 pinmux
  ARM: orion5x: fixup 5181 MPP mask check
  ARM: mxs-dma: include <linux/dmaengine.h>
  ARM: i.MX53: consistently use MX53_UART_PAD_CTRL for uart txd/rxd/rts/cts
  ARM: i.MX53: UARTn_CTS pin should not change RTS input select
  ARM: i.MX53: UARTn_TXD pin should not change RXD input select
  ARM: mx25: Fix typo on CAN1_RX pad setting
  iomux-mx53: add missing 'IOMUX_CONFIG_SION' for some I2C pad definitions
  ARM: NUC93X: add UL suffix to VMALLOC_END to ensure it is properly typed
  ARM: LPC32XXX: add UL suffix to VMALLOC_END to ensure it is properly typed
  ARM: CNS3XXX: add UL suffix to VMALLOC_END to ensure it is properly typed
  ARM: i.MX53: Fix IOMUX type o's
  ARM i.MX dma: Fix burstsize settings
  mach-mx5: fix the I2C clock parents
  ARM: mxs/tx28: according to the TX28's datasheet D4-D7 are not used for MMC0
  ARM i.MX23/28: platform-mxsfb: Add missing include of linux/dma-mapping.h
  ARM: mx53: Fix some interrupts marked as reserved.
  MXC: iomux-v3: correct NO_PAD_CTRL definition
  ...

Fix up trivial conflict in arch/arm/mach-imx/mach-mx31_3ds.c
2011-07-25 11:53:35 -07:00
..
amba-duart.c ARM: mxs: Change duart device to use amba-pl011 2011-01-12 14:47:15 +01:00
Kconfig ARM: mxs: dynamically allocate mmc device 2011-03-25 08:36:55 +01:00
Makefile gpio/mxs: Change gpio-mxs into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
platform-auart.c net: remove mm.h inclusion from netdevice.h 2011-06-21 19:17:20 -07:00
platform-dma.c net: remove mm.h inclusion from netdevice.h 2011-06-21 19:17:20 -07:00
platform-fec.c net: remove mm.h inclusion from netdevice.h 2011-06-21 19:17:20 -07:00
platform-flexcan.c ARM: mxs: dynamically register flexcan devices for mx28 2011-02-03 15:11:19 +01:00
platform-gpio-mxs.c gpio/mxs: Change gpio-mxs into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
platform-mxs-i2c.c ARM: mxs: fix naming of struct holding info for mxs-i2c devices 2011-05-19 13:11:23 +02:00
platform-mxs-mmc.c ARM: mxs: dynamically allocate mmc device 2011-03-25 08:36:55 +01:00
platform-mxs-pwm.c ARM: mxs: Add pwm clocks and device registration 2011-03-01 14:19:59 +01:00
platform-mxsfb.c ARM i.MX23/28: platform-mxsfb: Add missing include of linux/dma-mapping.h 2011-07-07 09:07:43 +02:00