linux/arch/arm/mach-lpc32xx/include/mach
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
..
clkdev.h ARM: LPC32XX: Initial arch header files 2010-07-27 03:08:08 -07:00
debug-macro.S arm: return both physical and virtual addresses from addruart 2010-10-20 00:27:33 -04:00
entry-macro.S ARM: entry: remove unused irq_prio_table macro 2011-06-28 10:34:58 +01:00
gpio.h ARM: LPC32XX: Initial arch header files 2010-07-27 03:08:08 -07:00
hardware.h ARM: LPC32XX: Initial arch header files 2010-07-27 03:08:08 -07:00
i2c.h ARM: LPC32XX: Initial arch header files 2010-07-27 03:08:08 -07:00
io.h ARM: LPC32XX: Initial arch header files 2010-07-27 03:08:08 -07:00
irqs.h ARM: LPC32XX: Initial arch header files 2010-07-27 03:08:08 -07:00
memory.h ARM: P2V: separate PHYS_OFFSET from platform definitions 2011-02-17 23:26:55 +00:00
platform.h ARM: LPC32XX: Initial arch header files 2010-07-27 03:08:08 -07:00
system.h ARM: LPC32XX: Initial arch header files 2010-07-27 03:08:08 -07:00
timex.h ARM: LPC32XX: Initial arch header files 2010-07-27 03:08:08 -07:00
uncompress.h ARM: LPC32XX: Initial arch header files 2010-07-27 03:08:08 -07:00
vmalloc.h ARM: LPC32XXX: add UL suffix to VMALLOC_END to ensure it is properly typed 2011-07-08 15:55:22 +00:00