summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-mxc/include
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-03-273-36/+2
|\
| * Merge branch 'next/fixes-non-critical' into next/driversArnd Bergmann2012-03-201-21/+21
| |\
| * \ Merge branch 'imx/driver' of git://git.linaro.org/people/shawnguo/linux-2.6 i...Arnd Bergmann2012-02-282-3/+2
| |\ \
| | * | ARM: mxc: make imx_dma_is_general_purpose more generic for sdmaRichard Zhao2012-02-271-2/+1
| | * | ARM: imx6: Rename DEBUG_IMX6Q_UART to UART4Dirk Behme2012-02-271-1/+1
| * | | Merge branch 'features/cs89x0' of git://git.pengutronix.de/git/imx/linux-2.6 ...Arnd Bergmann2012-02-271-33/+0
| |\ \ \
| | * | | CS89x0 : add CS89x0 platform device to the iMX31ADS boardJaccon Bastiaansen2012-02-011-33/+0
| | |/ /
* | | | Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-03-271-0/+9
|\ \ \ \
| * \ \ \ Merge branch 'features/imx3' of git://git.pengutronix.de/git/imx/linux-2.6 in...Arnd Bergmann2012-03-021-0/+9
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | ARM: mx3: Setup AIPS registersFabio Estevam2012-03-021-0/+1
| | * | | ARM: mx3: Let mx31 and mx35 enter in LPM mode in WFIFabio Estevam2012-03-021-0/+8
| | |/ /
* | | | Merge tag 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2012-03-271-21/+21
|\ \ \ \ | | |_|/ | |/| |
| * | | iomux-mx25.h slew rate adjusted for LCD __LD pinsMehnert2012-03-131-21/+21
| | |/ | |/|
* | | Merge branch 'for-armsoc' of git://git.linaro.org/people/rmk/linux-armLinus Torvalds2012-03-232-41/+0
|\ \ \
| * \ \ Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux ...Russell King2012-02-221-16/+0
| |\ \ \ | | |_|/ | |/| |
| | * | ARM: remove disable_fiq and arch_ret_to_user macrosRob Herring2012-02-211-16/+0
| | |/
| * | Merge tag 'v3.3-rc2' into depends/rmk/for-armsocOlof Johansson2012-02-071-1/+1
| |\ \ | | |/
| * | ARM: big removal of now unused arch_idle()Nicolas Pitre2012-01-201-25/+0
* | | Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2012-03-231-0/+2
|\ \ \
| * \ \ Merge tag 'v3.3' into staging/for_v3.4Mauro Carvalho Chehab2012-03-191-1/+1
| |\ \ \ | | | |/ | | |/|
| * | | [media] MX2: Add platform definitions for eMMa-PrP deviceJavier Martin2012-02-281-0/+2
| | |/ | |/|
* | | Merge tag 'sound-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/...Linus Torvalds2012-03-221-60/+0
|\ \ \
| * | | ASoC: imx: move audmux driver into sound/soc/imxShawn Guo2012-03-061-60/+0
| | |/ | |/|
* | | usb: otg: ulpi: Start using struct usb_otgHeikki Krogerus2012-02-131-1/+1
* | | usb: otg: Rename otg_transceiver to usb_phyHeikki Krogerus2012-02-132-3/+3
|/ /
* | ARM: imx: iomux-v1.h: Fix build error due to __init annotationFabio Estevam2012-01-261-1/+1
|/
* Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dmaLinus Torvalds2012-01-171-0/+15
|\
| * video i.MX IPU: Fix display connectionsSascha Hauer2011-12-081-0/+15
* | Merge tag 'pm' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-01-092-2/+8
|\ \
| * \ Merge branch 'imx6/pm' into next/pmArnd Bergmann2012-01-032-2/+8
| |\ \
| | * | ARM: imx6q: build pm code only when CONFIG_PM selectedEric Miao2011-12-261-1/+7
| | * | ARM: mx5: use generic irq chip pm interface for pm functions onHui Wang2011-12-251-1/+1
* | | | Merge branch 'samsung/cleanup' into next/boardsArnd Bergmann2012-01-093-3/+3
|\ \ \ \
| * \ \ \ Merge branch 'restart' into for-linusRussell King2012-01-052-3/+2
| |\ \ \ \
| | * | | | ARM: 7198/1: arm/imx6: add restart support for imx6qShawn Guo2012-01-051-0/+1
| | * | | | ARM: restart: remove the now empty arch_reset()Russell King2012-01-051-4/+0
| | * | | | ARM: restart: mxc: use new restart hookRussell King2012-01-052-2/+4
| | | |/ / | | |/| |
| * | | | Merge branch 'devel-stable' into for-linusRussell King2012-01-054-36/+0
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | enable uncompress log on cpuimx35sdEric Bénard2011-12-191-0/+1
| | |/ / | |/| |
* | | | Merge branch 'imx/board' into next/boardsArnd Bergmann2012-01-031-0/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | iomux-mx25: configuration to support CSPI3 on CSI pinsPaul Fertser2012-01-031-0/+4
| |/ /
* | | Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-s...Russell King2011-12-052-24/+0
|\ \ \
| * | | ARM: big removal of now unused vmalloc.h filesNicolas Pitre2011-11-261-22/+0
| * | | ARM: plat-mxc: remove inclusion of <mach/vmalloc.h>Nicolas Pitre2011-11-151-2/+0
* | | | Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/will/...Russell King2011-12-053-21/+2
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'imx-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 int...Arnd Bergmann2011-11-233-21/+1
| |\ \ \
| | * \ \ Merge branch 'cleanups/assorted' into imx-fixes-for-arndSascha Hauer2011-11-223-21/+1
| | |\ \ \ | | | |/ / | | |/| |
| | | * | arm/imx: remove imx_idle hook and use pm_idle insteadShawn Guo2011-11-112-7/+1
| | | * | ARM: imx: Remove unused chip revision stringsFabio Estevam2011-11-111-14/+0
| | | |/
| * | | ARM: imx6q: move clock register map to machine_desc.map_ioRichard Zhao2011-11-171-0/+1
| |/ /
OpenPOWER on IntegriCloud