Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-07 20:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
b77816dea3
linux/arch/arm/plat-mxc/include/mach
History
Olof Johansson a5f17d1f4c Linux 3.3-rc2 
.. several days delayed. No reason, I just didn't think of it.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
 iQEcBAABAgAGBQJPKF4KAAoJEHm+PkMAQRiGw/YH+wXg2DpZUuHeBK52zMGlJBPc
 DzX11/Uan3Y07gM0JbDzuVxwjX4vdxR2bV6r1qsLP8JEUnE8jyFC32DBGi5WAht7
 F4KU/Uov2Ds5/wzvY4Iuo01C+JftQHXuy/Sbhck1d0LI0yjLejRaw+zuJv0x2/eS
 7YqV+KTGE1lDuJs/Gyq1Vqr1g9831AuS1tv/g3gaqBuN6TcPBFCocaVxzwrUc+y6
 94h26XbbOhQRIz38oqUkiqAGnvYS61ocyBcEiRHf0dXkNSDIINqlgukvd7YTXouA
 jj/w/DWpMRcQuYAgqkrurr9+yWC9hVQcsvvQ5sAQnIPcxoR868sg1pO8Oheq+1g=
 =kUzV
 -----END PGP SIGNATURE-----

Merge tag 'v3.3-rc2' into depends/rmk/for-armsoc

There were conflicts between fixes going in after 3.3-rc1 and
Russell's stable arm-soc base branch. Resolving it in the dependency
branch so that each topic branch shares the same resolution.

Conflicts:
	arch/arm/mach-at91/at91cap9.c
	arch/arm/mach-at91/at91sam9g45.c
2012-02-07 15:05:20 -08:00
..
3ds_debugboard.h
audmux.h MX51: Add AUDMUX ports definitions 2011-03-23 15:08:13 +01:00
board-mx31ads.h
board-mx31lilly.h
board-mx31lite.h
board-mx31moboard.h
board-pcm038.h
clock.h
common.h power management changes for omap and imx 2012-01-09 14:39:59 -08:00
debug-macro.S Merge branch 'next/cross-platform' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 20:34:22 -07:00
devices-common.h Merge branch 'next/driver' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 20:16:43 -07:00
dma.h dmaengine: imx-sdma: use platform_device_id to identify sdma version 2011-07-27 09:31:45 +08:00
entry-macro.S ARM: imx: convert smp platforms to global gic_handle_irq() 2011-11-15 18:13:59 +00:00
esdhc.h mmc: sdhci-esdhc-imx: extend card_detect and write_protect support for mx5 2011-07-27 09:31:14 +08:00
eukrea-baseboards.h
gpio.h Merge branch 'highbank/soc' into next/soc 2011-11-02 02:46:10 +01:00
hardware.h arm/imx6q: add core definitions and low-level debug uart 2011-10-31 14:26:21 +01:00
i2c.h i2c-imx: remove init/exit hooks from platform data 2011-09-14 22:14:41 +01:00
iim.h
imx-uart.h
imxfb.h
io.h arm/imx: remove cpu_is_xxx() check from __imx_ioremap() 2011-10-04 10:55:12 +02:00
iomux-mx1.h
iomux-mx2x.h mx2/iomux: Set direction for CSPI2 pins 2011-03-25 08:21:34 +01:00
iomux-mx3.h mx31moboard: Add poweroff support 2011-09-20 14:53:00 +02:00
iomux-mx21.h
iomux-mx25.h iomux-mx25: configuration to support CSPI3 on CSI pins 2012-01-03 09:47:14 +01:00
iomux-mx27.h
iomux-mx35.h ARM: imx35: fix ATA_DATA3 pad control address 2011-03-07 19:29:09 +01:00
iomux-mx50.h ARM: imx50: correct iomux-mx50.h wrong daisy chain settings 2011-02-18 11:01:34 +01:00
iomux-mx51.h ARM: i.MX51: clean up iomux-mx51.h 2011-08-17 08:41:23 +02:00
iomux-mx53.h ARM: i.MX53: clean up iomux-mx53.h 2011-08-17 08:43:32 +02:00
iomux-v1.h ARM: imx: iomux-v1.h: Fix build error due to __init annotation 2012-01-26 12:56:37 +01:00
iomux-v3.h Merge branch 'next/fixes' into next/cleanup 2011-10-31 23:25:41 +01:00
ipu.h
iram.h
irqs.h arm/imx6q: add core definitions and low-level debug uart 2011-10-31 14:26:21 +01:00
mmc.h
mx1_camera.h
mx1.h ARM: plat-mxc: remove inclusion of <mach/vmalloc.h> 2011-11-15 22:30:39 -05:00
mx2_cam.h
mx2x.h
mx3_camera.h
mx3fb.h video i.MX IPU: Fix display connections 2011-12-08 12:59:03 +05:30
mx3x.h ARM: mx35: use generic function for displaying silicon revision 2011-08-26 08:50:59 +02:00
mx6q.h arm/imx6q: add core definitions and low-level debug uart 2011-10-31 14:26:21 +01:00
mx21-usbhost.h
mx21.h ARM: mx25: move registration of gpios to plat-mxc/gpio.c 2010-11-17 10:01:38 +01:00
mx25.h Merge branches 'features/assorted', 'features/imx-pata' and 'features/imx-multi-irq-v2' into imx-features 2011-09-29 10:40:29 +02:00
mx27.h arm/imx: remove mx27_setup_weimcs() from mx27.h 2011-10-17 21:41:03 +02:00
mx31.h arm/imx: remove mx31_setup_weimcs() from mx31.h 2011-10-17 21:41:03 +02:00
mx35.h ARM: imx: Add PATA resources for other i.MX processors 2011-08-24 10:11:40 +02:00
mx50.h ARM: mx50: Add support to get the silicon revision 2011-03-23 15:08:15 +01:00
mx51.h Merge branches 'cleanups/assorted' and 'cleanups/mm-tzic' into imx-cleanup 2011-09-20 10:09:08 +02:00
mx53.h ARM: mx5/mm: consolidate TZIC map code 2011-09-20 09:55:06 +02:00
mxc_ehci.h ARM i.MX ehci: do ehci init in board specific functions 2011-02-11 08:40:45 +01:00
mxc_nand.h Fix common misspellings 2011-03-31 11:26:23 -03:00
mxc.h ARM: mx5: use generic irq chip pm interface for pm functions on 2011-12-25 12:02:28 +08:00
sdma.h dmaengine: imx-sdma: use platform_device_id to identify sdma version 2011-07-27 09:31:45 +08:00
spi.h
ssi.h
timex.h ARM i.MX: define CLOCK_TICK_RATE to bogus value 2011-07-07 09:59:58 +02:00
ulpi.h ARM i.MX: introduce imx_otg_ulpi_create to create ULPI transceivers 2011-03-07 19:29:41 +01:00
uncompress.h enable uncompress log on cpuimx35sd 2011-12-19 12:26:09 +01:00
usb.h