2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-23 04:34:11 +08:00
linux-next/arch/arm/mach-mx3
Linus Torvalds ac0f6f927d Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (100 commits)
  ARM: Eliminate decompressor -Dstatic= PIC hack
  ARM: 5958/1: ARM: U300: fix inverted clk round rate
  ARM: 5956/1: misplaced parentheses
  ARM: 5955/1: ep93xx: move timer defines into core.c and document
  ARM: 5954/1: ep93xx: move gpio interrupt support to gpio.c
  ARM: 5953/1: ep93xx: fix broken build of clock.c
  ARM: 5952/1: ARM: MM: Add ARM_L1_CACHE_SHIFT_6 for handle inside each ARCH Kconfig
  ARM: 5949/1: NUC900 add gpio virtual memory map
  ARM: 5948/1: Enable timer0 to time4 clock support for nuc910
  ARM: 5940/2: ARM: MMCI: remove custom DBG macro and printk
  ARM: make_coherent(): fix problems with highpte, part 2
  MM: Pass a PTE pointer to update_mmu_cache() rather than the PTE itself
  ARM: 5945/1: ep93xx: include correct irq.h in core.c
  ARM: 5933/1: amba-pl011: support hardware flow control
  ARM: 5930/1: Add PKMAP area description to memory.txt.
  ARM: 5929/1: Add checks to detect overlap of memory regions.
  ARM: 5928/1: Change type of VMALLOC_END to unsigned long.
  ARM: 5927/1: Make delimiters of DMA area globally visibly.
  ARM: 5926/1: Add "Virtual kernel memory..." printout.
  ARM: 5920/1: OMAP4: Enable L2 Cache
  ...

Fix up trivial conflict in arch/arm/mach-mx25/clock.c
2010-03-01 09:15:15 -08:00
..
armadillo5x0.c Armadillo500 Add support for Seiko Instruments S-35390A rtc over i2c. 2009-11-14 10:29:13 +01:00
clock-imx35.c ARM: Consolidate clks_register() and similar 2010-02-12 17:32:36 +00:00
clock.c ARM: Consolidate clks_register() and similar 2010-02-12 17:32:36 +00:00
cpu.c ARM: MX3: fix CPU revision number detection 2009-11-23 11:51:18 +01:00
crm_regs.h MX31 clkdev support 2009-03-13 10:34:32 +01:00
devices.c i.MX3: Add sound (ssi) resources 2009-11-14 10:30:38 +01:00
devices.h i.MX3: Add sound (ssi) resources 2009-11-14 10:30:38 +01:00
iomux.c mx31: remove gpio_request calls from iomux code 2009-05-07 16:20:40 +02:00
Kconfig imx/mx3: depend on USB_ULPI for otg_ulpi_create 2010-01-04 13:26:23 +01:00
kzmarm11.c Add KZM-ARM11-01 support 2009-11-27 09:17:00 +01:00
Makefile Add KZM-ARM11-01 support 2009-11-27 09:17:00 +01:00
Makefile.boot [ARM] 4461/1: MXC platform and i.MX31ADS core support 2007-07-22 15:44:46 +01:00
mm.c ARM: MX3: make CPU revision number detection work on all boards 2010-01-04 12:28:58 +01:00
mx31ads.c mx31ads: Provide an IRQ range to the WM835x on the 1133-EV1 module 2010-01-05 17:08:54 +01:00
mx31lilly-db.c ARM: MX3: lilly1131: move MC13783 device registration 2009-11-23 11:51:00 +01:00
mx31lilly.c ARM: MX3: lilly1131: move MC13783 device registration 2009-11-23 11:51:00 +01:00
mx31lite-db.c ARM: MX3: add support for GPIO LEDs on litekit db 2009-11-19 17:11:02 +01:00
mx31lite.c imx/mx3: depend on USB_ULPI for otg_ulpi_create 2010-01-04 13:26:23 +01:00
mx31moboard-devboard.c mx31moboard: fix usbh device names 2010-01-04 11:47:43 +01:00
mx31moboard-marxbot.c mx31moboard: fix usbh device names 2010-01-04 11:47:43 +01:00
mx31moboard.c imx/mx3: depend on USB_ULPI for otg_ulpi_create 2010-01-04 13:26:23 +01:00
mx31pdk.c ARM: MX3: make CPU revision number detection work on all boards 2010-01-04 12:28:58 +01:00
mx35pdk.c mx35: add usb gadget support in mx35pdk.c 2009-11-30 10:04:46 +01:00
pcm037_eet.c mx3: Fix double pin allocation in pcm037_eet.c 2009-07-31 16:38:03 +02:00
pcm037.c mx3: add support for the mt9v022 camera sensor to pcm037 platform 2010-01-04 11:47:43 +01:00
pcm037.h ARM: add support for the EET board, based on the i.MX31 pcm037 module 2009-06-23 14:25:26 +02:00
pcm043.c pcm043: Add NAND support 2009-11-14 10:30:19 +01:00
qong.c mx3: Codingstyle: Let the compiler count arrays 2009-08-07 12:10:55 +02:00