Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
* | Merge branch 'imx/fix-irqdomain' of git://git.linaro.org/people/shawnguo/linu... | Arnd Bergmann | 2011-12-06 | 1 | -4/+5 | |
|\ | ||||||
| * | arm/imx: fix irq_base for gpio | Shawn Guo | 2011-12-01 | 1 | -3/+2 | |
| * | arm/imx: fix return type of callback passed to of_irq_init() | Shawn Guo | 2011-12-01 | 1 | -1/+3 | |
* | | Merge branch 'imx-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 int... | Arnd Bergmann | 2011-11-23 | 2 | -64/+58 | |
|\ \ | ||||||
| * \ | Merge branch 'cleanups/remove-unused-kconfig' into imx-fixes-for-arnd | Sascha Hauer | 2011-11-22 | 1 | -13/+0 | |
| |\ \ | ||||||
| | * | | ARM: imx: drop 'ARCH_MX31' and 'ARCH_MX35' | Paul Bolle | 2011-11-22 | 1 | -13/+0 | |
| | |/ | ||||||
| * | | Merge branch 'cleanups/assorted' into imx-fixes-for-arnd | Sascha Hauer | 2011-11-22 | 1 | -25/+28 | |
| |\ \ | ||||||
| | * | | arm/imx: remove imx_idle hook and use pm_idle instead | Shawn Guo | 2011-11-11 | 1 | -25/+28 | |
| * | | | ARM: imx/mm-imx3: conditionally compile i.MX31 and i.MX35 code | Uwe Kleine-König | 2011-11-22 | 1 | -27/+31 | |
| | |/ | |/| | ||||||
* | | | Merge branch 'for-arnd' of git://git.kernel.org/pub/scm/linux/kernel/git/will... | Arnd Bergmann | 2011-11-23 | 1 | -0/+7 | |
|\ \ \ | ||||||
| * | | | ARM: mach-imx: convert logical CPU numbers to physical numbers | Will Deacon | 2011-11-16 | 1 | -0/+7 | |
| |/ / | ||||||
* / / | ARM: imx6q: move clock register map to machine_desc.map_io | Richard Zhao | 2011-11-17 | 2 | -2/+6 | |
|/ / | ||||||
* | | arm/imx: fix imx6q mmc error when mounting rootfs | Shawn Guo | 2011-11-11 | 1 | -1/+16 | |
* | | arm/imx: fix the references to ARCH_MX3 | Shawn Guo | 2011-11-11 | 1 | -15/+19 | |
|/ | ||||||
* | Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kern... | Linus Torvalds | 2011-11-07 | 3 | -0/+3 | |
|\ | ||||||
| * | arm: fix implicit use of moduleparam in mach-mx31*.c | Paul Gortmaker | 2011-11-01 | 3 | -0/+3 | |
* | | Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6 | Linus Torvalds | 2011-11-03 | 5 | -11/+15 | |
|\ \ | ||||||
| * | | ARM: imx/mx31moboard: use mc13xxx structs instead of removed mc13783 structs | Uwe Kleine-König | 2011-10-24 | 1 | -3/+3 | |
| * | | ARM: imx/mx31moboard: Add mc13783 power button support | Philippe Rétornaz | 2011-10-24 | 1 | -0/+8 | |
| * | | ARM: imx+mc13xxx: remove obsolete leds and regulators flags | Philippe Rétornaz | 2011-10-24 | 5 | -9/+5 | |
| * | | ARM: imx: use mc13xxx constants instead of mc13783 | Uwe Kleine-König | 2011-10-24 | 3 | -5/+5 | |
* | | | Merge branch 'next/soc' of git://git.linaro.org/people/arnd/arm-soc | Linus Torvalds | 2011-11-02 | 14 | -1/+2739 | |
|\ \ \ | ||||||
| * \ \ | Merge branch 'imx/imx6q' into next/soc | Arnd Bergmann | 2011-11-02 | 14 | -1/+2739 | |
| |\ \ \ | ||||||
| | * | | | arm/imx: merge i.MX3 and i.MX6 | Sascha Hauer | 2011-10-31 | 1 | -4/+3 | |
| | * | | | arm/imx6q: add suspend/resume support | Shawn Guo | 2011-10-31 | 3 | -1/+99 | |
| | * | | | arm/imx6q: add device tree machine support | Shawn Guo | 2011-10-31 | 2 | -1/+85 | |
| | * | | | arm/imx6q: add smp and cpu hotplug support | Shawn Guo | 2011-10-31 | 6 | -0/+241 | |
| | * | | | arm/imx6q: add core drivers clock, gpc, mmdc and src | Shawn Guo | 2011-10-31 | 6 | -0/+2263 | |
| | * | | | arm/imx6q: add core definitions and low-level debug uart | Shawn Guo | 2011-10-31 | 4 | -0/+53 | |
| | * | | | Merge branch 'imx/devel' into imx/imx6q | Arnd Bergmann | 2011-10-31 | 47 | -384/+481 | |
| | |\ \ \ | ||||||
| * | \ \ \ | Merge branch 'highbank/soc' into next/soc | Arnd Bergmann | 2011-11-02 | 2 | -4/+2 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Merge branch 'dt/gic' into highbank/soc | Arnd Bergmann | 2011-10-31 | 26 | -27/+27 | |
| | |\| | | | | ||||||
| | | \ \ \ \ | ||||||
| | | \ \ \ \ | ||||||
| | *-. \ \ \ \ | Merge branches 'depends/rmk/io', 'depends/rmk/l2x0' and 'depends/rmk/gpio' in... | Arnd Bergmann | 2011-10-30 | 2 | -4/+2 | |
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | ||||||
| * | | | | | | | Merge branch 'imx/devel' into next/dt | Arnd Bergmann | 2011-11-01 | 47 | -384/+481 | |
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | / / | | | |_|_|/ / | | |/| | | | | ||||||
| | * | | | | | Merge branch 'imx-features-for-arnd' of git://git.pengutronix.de/git/imx/linu... | Arnd Bergmann | 2011-10-20 | 3 | -3/+3 | |
| | |\| | | | | ||||||
* | | | | | | | Merge branch 'next/devel' of git://git.linaro.org/people/arnd/arm-soc | Linus Torvalds | 2011-11-02 | 39 | -90/+185 | |
|\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge branch 'depends/rmk/gpio' into next/devel | Arnd Bergmann | 2011-10-31 | 2 | -4/+2 | |
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | ||||||
| | | | | | | | | ||||||
| | \ \ \ \ \ \ | ||||||
| *-. \ \ \ \ \ \ | Merge branches 'sirf/devel', 'at91/devel', 'imx/devel' and 'davinci/devel' in... | Arnd Bergmann | 2011-10-07 | 47 | -384/+481 | |
| |\ \ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | / / / | | |_|_|_|/ / / | |/| | | | | | | ||||||
| | | * | | | | | Merge branch 'imx/cleanup' into imx/devel | Arnd Bergmann | 2011-10-07 | 11 | -289/+279 | |
| | | |\ \ \ \ \ | ||||||
| | | | \ \ \ \ \ | ||||||
| | | | \ \ \ \ \ | ||||||
| | | | \ \ \ \ \ | ||||||
| | | | \ \ \ \ \ | ||||||
| | | *---. \ \ \ \ \ | Merge branches 'features/assorted', 'features/imx-pata' and 'features/imx-mul... | Sascha Hauer | 2011-09-29 | 30 | -0/+49 | |
| | | |\ \ \ \ \ \ \ \ | ||||||
| | | | | | * | | | | | | ARM i.MX boards: use CONFIG_MULTI_IRQ_HANDLER | Sascha Hauer | 2011-09-26 | 29 | -0/+30 | |
| | | |_|_|/ / / / / / | | |/| | | | | | | | | ||||||
| | | | * | | | | | | | mx31moboard: Add poweroff support | Philippe Rétornaz | 2011-09-20 | 1 | -0/+17 | |
| | | | * | | | | | | | ARM: mach-qong: Add watchdog support | Fabio Estevam | 2011-09-20 | 2 | -0/+2 | |
| | | | | | | | | | | | ||||||
| | | | \ \ \ \ \ \ \ | ||||||
| | | | \ \ \ \ \ \ \ | ||||||
| | | | \ \ \ \ \ \ \ | ||||||
| | | | \ \ \ \ \ \ \ | ||||||
| | | | \ \ \ \ \ \ \ | ||||||
| | | *-----. \ \ \ \ \ \ \ | Merge branches 'features/assorted', 'features/imx-cpurev', 'features/imx-pata... | Sascha Hauer | 2011-08-26 | 13 | -96/+143 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / | | | |/| | | | / / / / / / | | | | | | |_|/ / / / / / | | | | | |/| | | | | / / | | | | | | | | |_|_|/ / | | | | | | | |/| | | | | ||||||
| | | | | | * / | | | | | ARM i.MX: allow to compile together ARMv4 and ARMv5 based SoCs | Sascha Hauer | 2011-08-24 | 1 | -33/+17 | |
| | | |_|_|/ / / / / / | | |/| | | | | | | | | ||||||
| | | | * | | | | | | | ARM: mx35: use generic function for displaying silicon revision | Jason Liu | 2011-08-26 | 2 | -17/+16 | |
| | | | * | | | | | | | ARM: mx31: use generic function for displaying silicon revision | Jason Liu | 2011-08-26 | 2 | -24/+29 | |
| | | | * | | | | | | | ARM: mx27: Print silicon revision on boot | Jason Liu | 2011-08-26 | 2 | -15/+15 | |
| | | | * | | | | | | | ARM: mx25: Print silicon revision on boot | Jason Liu | 2011-08-26 | 3 | -1/+48 | |
| | | |/ / / / / / / | | |/| | | | | | | | ||||||
| | | * | | | | | | | ARM: mach-imx/mx25_3ds: Add FlexCAN support | Fabio Estevam | 2011-08-26 | 2 | -0/+11 |