leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
411f5c7a50
linux/arch/arm/mach-mx3
History
Linus Torvalds 411f5c7a50 Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm 
* 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm: (289 commits)
  davinci: DM644x EVM: register MUSB device earlier
  davinci: add spi devices on tnetv107x evm
  davinci: add ssp config for tnetv107x evm board
  davinci: add tnetv107x ssp platform device
  spi: add ti-ssp spi master driver
  mfd: add driver for sequencer serial port
  ARM: EXYNOS4: Implement Clock gating for System MMU
  ARM: EXYNOS4: Enhancement of System MMU driver
  ARM: EXYNOS4: Add support for gpio interrupts
  ARM: S5P: Add function to register gpio interrupt bank data
  ARM: S5P: Cleanup S5P gpio interrupt code
  ARM: EXYNOS4: Add missing GPYx banks
  ARM: S3C64XX: Fix section mismatch from cpufreq init
  ARM: EXYNOS4: Add keypad device to the SMDKV310
  ARM: EXYNOS4: Update clocks for keypad
  ARM: EXYNOS4: Update keypad base address
  ARM: EXYNOS4: Add keypad device helpers
  ARM: EXYNOS4: Add support for SATA on ARMLEX4210
  plat-nomadik: make GPIO interrupts work with cpuidle ApSleep
  mach-u300: define a dummy filter function for coh901318
  ...

Fix up various conflicts in
 - arch/arm/mach-exynos4/cpufreq.c
 - arch/arm/mach-mxs/gpio.c
 - drivers/net/Kconfig
 - drivers/tty/serial/Kconfig
 - drivers/tty/serial/Makefile
 - drivers/usb/gadget/fsl_mxc_udc.c
 - drivers/video/Kconfig
2011-03-17 19:08:06 -07:00
..
clock-imx31.c Merge branch 'devel-stable' into devel 2011-01-06 22:33:32 +00:00
clock-imx35.c Merge branch 'devel-stable' into devel 2011-01-06 22:33:32 +00:00
cpu.c ARM: imx: Get the silicon version from the IIM module 2010-11-28 19:51:47 +01:00
crm_regs.h imx31: define and use MX31_IO_ADDRESS 2010-01-08 16:41:26 +01:00
devices-imx31.h ARM: mx3: dynamically allocate imx-keypad devices 2010-11-19 21:54:36 +01:00
devices-imx35.h ARM: imx35: fix trivial copy/paste error 2011-03-07 19:29:11 +01:00
devices.c ARM: mx3: dynamically allocate imx-keypad devices 2010-11-19 21:54:36 +01:00
devices.h ARM: mx3: dynamically allocate imx-keypad devices 2010-11-19 21:54:36 +01:00
ehci-imx31.c ARM i.MX ehci: factor out soc specific functions 2011-02-11 08:34:17 +01:00
ehci-imx35.c ARM i.MX ehci: factor out soc specific functions 2011-02-11 08:34:17 +01:00
eukrea_mbimxsd-baseboard.c arm: mach-mx3: use IMX_GPIO_NR instead of hard-coded values 2011-03-01 14:19:48 +01:00
iomux-imx31.c ARM: iomux-imx31: allow pin_list to be const 2011-03-07 19:29:28 +01:00
Kconfig ARM: mx31_3ds: Add I2C support 2011-03-07 19:29:23 +01:00
mach-armadillo5x0.c ARM i.MX: introduce imx_otg_ulpi_create to create ULPI transceivers 2011-03-07 19:29:41 +01:00
mach-bug.c mx31: add support for the bugbase 1.3 from buglabs 2011-02-28 09:28:46 +01:00
mach-cpuimx35.c ARM: mx3/cpuimx35: fix build failure 2011-03-07 19:29:20 +01:00
mach-kzm_arm11_01.c Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-17 19:08:06 -07:00
mach-mx31_3ds.c mach-mx31_3ds: Add support for the camera device on the personality board 2011-03-08 13:24:22 +01:00
mach-mx31ads.c ARM: mx3/mx31ads: fix comments of irq callbacks 2011-02-11 18:37:34 +01:00
mach-mx31lilly.c ARM i.MX: introduce imx_otg_ulpi_create to create ULPI transceivers 2011-03-07 19:29:41 +01:00
mach-mx31lite.c ARM i.MX: introduce imx_otg_ulpi_create to create ULPI transceivers 2011-03-07 19:29:41 +01:00
mach-mx31moboard.c ARM i.MX: introduce imx_otg_ulpi_create to create ULPI transceivers 2011-03-07 19:29:41 +01:00
mach-mx35_3ds.c ARM: mx3/mx35_3ds: Use MX35 USB OTG Erratum 2011-03-07 19:29:33 +01:00
mach-pcm037_eet.c ARM i.MX31 pcm037 eet: remove unnecessary CONFIG_SPI_IMX ifdefs 2011-01-27 12:51:27 +01:00
mach-pcm037.c ARM i.MX: introduce imx_otg_ulpi_create to create ULPI transceivers 2011-03-07 19:29:41 +01:00
mach-pcm043.c ARM i.MX: introduce imx_otg_ulpi_create to create ULPI transceivers 2011-03-07 19:29:41 +01:00
mach-qong.c ARM: mx3: remove some useless comments 2011-02-11 18:37:33 +01:00
mach-vpr200.c ARM: mx3: use .init_early to initialize cpu type, reset address and iomuxer 2011-02-10 14:23:49 +01:00
Makefile mx31: add support for the bugbase 1.3 from buglabs 2011-02-28 09:28:46 +01:00
Makefile.boot
mm.c ARM i.MX: Move gpio initialization to SoC specific files 2011-03-07 19:29:37 +01:00
mx31lilly-db.c ARM: mx3: dynamically register mxc-mmc devices 2010-11-19 21:54:35 +01:00
mx31lite-db.c ARM: mx3: dynamically allocate imx2-wdt devices 2010-11-19 21:54:36 +01:00
mx31moboard-devboard.c ARM i.MX ehci: do ehci init in board specific functions 2011-02-11 08:40:45 +01:00
mx31moboard-marxbot.c ARM i.MX ehci: do ehci init in board specific functions 2011-02-11 08:40:45 +01:00
mx31moboard-smartbot.c ARM i.MX: introduce imx_otg_ulpi_create to create ULPI transceivers 2011-03-07 19:29:41 +01:00
pcm037.h