summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mxs/include/mach
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-05-263-21/+7
|\
| * mmc: mxs-mmc: move header from mach into linux folderShawn Guo2012-05-132-19/+1
| * mmc: mxs-mmc: get rid of the use of cpu_is_xxxShawn Guo2012-05-131-0/+1
| * gpio/mxs: get rid of the use of cpu_is_xxxShawn Guo2012-05-121-2/+2
| * ARM: mxs: do not add dma device by defaultDong Aisheng2012-05-121-0/+3
| * Merge branches 'clk/mxs' and 'imx/pinctrl/for-3.5' into mxs/dt/for-3.5Shawn Guo2012-05-121-0/+2
| |\
* | \ Merge tag 'clock' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-05-262-67/+1
|\ \ \
| | \ \
| | \ \
| *-. \ \ Merge branches 'spear/clock' and 'imx/clock' into next/clockArnd Bergmann2012-05-141-0/+2
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/
| * | | ARM: mxs: remove now unused timer_clk argument from mxs_timer_initShawn Guo2012-05-091-3/+1
| * | | ARM: mxs: remove old clock supportShawn Guo2012-05-092-64/+0
| |/ /
* | | Merge tag 'pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-05-221-0/+2
|\ \ \ | | |/ | |/|
| * | ARM: mxs: enable pinctrl dummy statesShawn Guo2012-05-081-0/+2
| |/
* | ARM: 7370/2: mxs: factor out dynamic amba device allocatorLinus Walleij2012-04-191-5/+0
|/
* Merge tag 'for-linus-3.4' of git://git.infradead.org/mtd-2.6Linus Torvalds2012-03-301-28/+0
|\
| * mxs-dma : move the mxs dma.h to a more common placeHuang Shijie2012-03-271-28/+0
* | Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm...Linus Torvalds2012-03-292-28/+0
|\ \
| * | ARM: create a common IOMEM definitionRob Herring2012-03-131-6/+0
| * | ARM: remove bunch of now unused mach/io.h filesRob Herring2012-03-061-22/+0
* | | Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-03-271-0/+10
|\ \ \
| * \ \ Merge branch 'mxs/gpmi' of git://git.linaro.org/people/shawnguo/linux-2.6 int...Arnd Bergmann2012-02-281-0/+10
| |\ \ \
| | * | | ARM: mxs: add GPMI-NAND support for imx23/imx28Huang Shijie2012-02-111-0/+10
| | | |/ | | |/|
* | | | Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-03-273-20/+23
|\ \ \ \
| * \ \ \ Merge branch 'mxs/boards' of git://git.linaro.org/people/shawnguo/linux-2.6 i...Olof Johansson2012-02-073-20/+23
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | ARM: mxs: detect SoC by checking CHIPID registerShawn Guo2012-01-273-20/+23
| | |/ /
* | | | Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-03-271-0/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch 'mxs/clk' of git://git.linaro.org/people/shawnguo/linux-2.6 into...Olof Johansson2012-02-071-0/+2
| |\ \ \ | | |/ / | |/| |
| | * | ARM: mxs: Use a proper timeout mechanismFabio Estevam2012-01-311-0/+2
| | |/
* | | Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux ...Russell King2012-02-221-6/+0
|\ \ \ | |/ / |/| |
| * | ARM: remove disable_fiq and arch_ret_to_user macrosRob Herring2012-02-211-6/+0
| |/
* | ARM: big removal of now unused arch_idle()Nicolas Pitre2012-01-201-25/+0
|/
* Merge branch 'samsung/driver' into next/driversArnd Bergmann2012-01-093-24/+1
|\
| * Merge branch 'restart' into for-linusRussell King2012-01-052-2/+1
| |\
| | * ARM: restart: remove the now empty arch_reset()Russell King2012-01-051-4/+0
| | * ARM: restart: mxs: use new restart hookRussell King2012-01-052-1/+4
| * | Merge branch 'devel-stable' into for-linusRussell King2012-01-051-22/+0
| |\ \ | | |/ | |/|
| | * ARM: big removal of now unused vmalloc.h filesNicolas Pitre2011-11-261-22/+0
* | | Merge branch 'omap/hwmod' into next/driversArnd Bergmann2011-12-272-2/+3
|\ \ \ | |/ /
| * | ARM: mx28: LRADC macro renamePeter Rusko2011-12-021-2/+2
| * | arm: mx23: recognise stmp378x as mx23Wolfram Sang2011-12-021-0/+1
| |/
* | ARM: mx28evk: add platform data for saifDong Aisheng2011-12-021-1/+3
* | ARM: mxs: add saif clkmux functionsDong Aisheng2011-12-022-0/+22
|/
* Merge branch 'next/cross-platform' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-011-10/+2
|\
| * arm/imx: use Kconfig choice for low-level debug UART selectionShawn Guo2011-10-171-10/+2
* | Merge branch 'next/devel' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-011-0/+12
|\ \
| * \ Merge branch 'depends/rmk/gpio' into next/develArnd Bergmann2011-10-311-31/+1
| |\ \
| * \ \ Merge branch 'imx-features-for-arnd' of git://git.pengutronix.de/git/imx/linu...Arnd Bergmann2011-10-202-0/+2
| |\ \ \
| * \ \ \ Merge branch 'imx/cleanup' into imx/develArnd Bergmann2011-10-072-4/+2
| |\ \ \ \
| * | | | | ARM: mxs: add saif deviceDong Aisheng2011-08-231-0/+12
| | |_|_|/ | |/| | |
* | | | | Merge branch 'next/board' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-012-0/+2
|\ \ \ \ \
| * \ \ \ \ Merge branch 'depends/rmk/devel-stable' into next/boardArnd Bergmann2011-11-012-25/+1
| |\ \ \ \ \
OpenPOWER on IntegriCloud