summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2011-11-063-0/+3
|\
| * arm: fix implicit use of moduleparam in mach-mx31*.cPaul Gortmaker2011-10-313-0/+3
* | Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6Linus Torvalds2011-11-035-11/+15
|\ \
| * | ARM: imx/mx31moboard: use mc13xxx structs instead of removed mc13783 structsUwe Kleine-König2011-10-241-3/+3
| * | ARM: imx/mx31moboard: Add mc13783 power button supportPhilippe Rétornaz2011-10-241-0/+8
| * | ARM: imx+mc13xxx: remove obsolete leds and regulators flagsPhilippe Rétornaz2011-10-245-9/+5
| * | ARM: imx: use mc13xxx constants instead of mc13783Uwe Kleine-König2011-10-243-5/+5
* | | Merge branch 'next/soc' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-0114-1/+2739
|\ \ \
| * \ \ Merge branch 'imx/imx6q' into next/socArnd Bergmann2011-11-0214-1/+2739
| |\ \ \
| | * | | arm/imx: merge i.MX3 and i.MX6Sascha Hauer2011-10-311-4/+3
| | * | | arm/imx6q: add suspend/resume supportShawn Guo2011-10-313-1/+99
| | * | | arm/imx6q: add device tree machine supportShawn Guo2011-10-312-1/+85
| | * | | arm/imx6q: add smp and cpu hotplug supportShawn Guo2011-10-316-0/+241
| | * | | arm/imx6q: add core drivers clock, gpc, mmdc and srcShawn Guo2011-10-316-0/+2263
| | * | | arm/imx6q: add core definitions and low-level debug uartShawn Guo2011-10-314-0/+53
| | * | | Merge branch 'imx/devel' into imx/imx6qArnd Bergmann2011-10-3147-384/+481
| | |\ \ \
| * | \ \ \ Merge branch 'highbank/soc' into next/socArnd Bergmann2011-11-022-4/+2
| |\ \ \ \ \
| | * | | | | Merge branch 'dt/gic' into highbank/socArnd Bergmann2011-10-3126-27/+27
| | |\| | | |
| | | \ \ \ \
| | | \ \ \ \
| | *-. \ \ \ \ Merge branches 'depends/rmk/io', 'depends/rmk/l2x0' and 'depends/rmk/gpio' in...Arnd Bergmann2011-10-302-4/+2
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Merge branch 'imx/devel' into next/dtArnd Bergmann2011-11-0147-384/+481
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | / / | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge branch 'imx-features-for-arnd' of git://git.pengutronix.de/git/imx/linu...Arnd Bergmann2011-10-203-3/+3
| | |\| | | |
* | | | | | | Merge branch 'next/devel' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-0139-90/+185
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'depends/rmk/gpio' into next/develArnd Bergmann2011-10-312-4/+2
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | | | | | | |
| | \ \ \ \ \ \
| *-. \ \ \ \ \ \ Merge branches 'sirf/devel', 'at91/devel', 'imx/devel' and 'davinci/devel' in...Arnd Bergmann2011-10-0747-384/+481
| |\ \ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | / / / | | |_|_|_|/ / / | |/| | | | | |
| | | * | | | | Merge branch 'imx/cleanup' into imx/develArnd Bergmann2011-10-0711-289/+279
| | | |\ \ \ \ \
| | | | \ \ \ \ \
| | | | \ \ \ \ \
| | | | \ \ \ \ \
| | | | \ \ \ \ \
| | | *---. \ \ \ \ \ Merge branches 'features/assorted', 'features/imx-pata' and 'features/imx-mul...Sascha Hauer2011-09-2930-0/+49
| | | |\ \ \ \ \ \ \ \
| | | | | | * | | | | | ARM i.MX boards: use CONFIG_MULTI_IRQ_HANDLERSascha Hauer2011-09-2629-0/+30
| | | |_|_|/ / / / / / | | |/| | | | | | | |
| | | | * | | | | | | mx31moboard: Add poweroff supportPhilippe Rétornaz2011-09-201-0/+17
| | | | * | | | | | | ARM: mach-qong: Add watchdog supportFabio Estevam2011-09-202-0/+2
| | | | | | | | | | |
| | | | \ \ \ \ \ \ \
| | | | \ \ \ \ \ \ \
| | | | \ \ \ \ \ \ \
| | | | \ \ \ \ \ \ \
| | | | \ \ \ \ \ \ \
| | | *-----. \ \ \ \ \ \ \ Merge branches 'features/assorted', 'features/imx-cpurev', 'features/imx-pata...Sascha Hauer2011-08-2613-96/+143
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / | | | |/| | | | / / / / / / | | | | | | |_|/ / / / / / | | | | | |/| | | | | / / | | | | | | | | |_|_|/ / | | | | | | | |/| | | |
| | | | | | * / | | | | ARM i.MX: allow to compile together ARMv4 and ARMv5 based SoCsSascha Hauer2011-08-241-33/+17
| | | |_|_|/ / / / / / | | |/| | | | | | | |
| | | | * | | | | | | ARM: mx35: use generic function for displaying silicon revisionJason Liu2011-08-262-17/+16
| | | | * | | | | | | ARM: mx31: use generic function for displaying silicon revisionJason Liu2011-08-262-24/+29
| | | | * | | | | | | ARM: mx27: Print silicon revision on bootJason Liu2011-08-262-15/+15
| | | | * | | | | | | ARM: mx25: Print silicon revision on bootJason Liu2011-08-263-1/+48
| | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | ARM: mach-imx/mx25_3ds: Add FlexCAN supportFabio Estevam2011-08-262-0/+11
| | | * | | | | | | ARM: i.MX: initialize l2x0 at early_init timeJason Liu2011-08-261-1/+1
| | |/ / / / / / /
* | | | | | | | | Merge branch 'next/driver' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-016-6/+18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Merge branch 'at91/trng' into next/driverArnd Bergmann2011-10-203-3/+3
| |\| | | | | | | |
| * | | | | | | | | Merge branches 'imx/pata' and 'imx/sata' into next/driverArnd Bergmann2011-10-204-3/+19
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| / / / / / / | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | ARM: imx: Define functions for registering PATAFabio Estevam2011-08-243-0/+12
| * | | | | | | | ARM: imx: Add PATA clock supportFabio Estevam2011-08-243-6/+6
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-0114-291/+287
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'next/fixes' into next/cleanupArnd Bergmann2011-10-314-5/+4
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'depends/rmk/memory_h' into next/fixesArnd Bergmann2011-10-3126-27/+27
| | |\ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ Merge branch 'imx/cleanup' into next/cleanupArnd Bergmann2011-10-203-2/+8
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'imx-cleanups-for-arnd' of git://git.pengutronix.de/git/imx/linu...Arnd Bergmann2011-10-206-5/+11
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | |
| | | * | | | | | | | | arm/imx: explicitly includes mach/hardware.h in pm-imx27.cShawn Guo2011-10-171-1/+1
| | | * | | | | | | | | arm/imx: remove mx27_setup_weimcs() from mx27.hShawn Guo2011-10-171-1/+3
| | | * | | | | | | | | arm/imx: explicitly includes mach/hardware.h in mach-kzm_arm11_01.cShawn Guo2011-10-171-0/+1