diff options
author | Olof Johansson <olof@lixom.net> | 2012-05-09 05:50:32 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-05-09 05:50:32 -0400 |
commit | f1a9fa2381d844bca66cefc842cbb65b263d74dc (patch) | |
tree | ec0e29fdfb2977997155c2cc14ebf242acfd3913 /arch/arm/mach-imx | |
parent | fd273d4415027f9b519d5a94e4fc030f278f2ad3 (diff) | |
parent | 95244306f6fb4f685dd8a672a6e6ea9f7dd1fd89 (diff) |
Merge branch 'board-specific' of git://github.com/hzhuang1/linux into next/boards
By Paul Parsons (5) and others
via Haojian Zhuang
* 'board-specific' of git://github.com/hzhuang1/linux:
pcmcia: add driver for hx4700
ARM: pxa: Add standard UART to hx4700_pin_config[]
ARM: mmp: add usb host support for aspen
ARM: mmp: add usb host support for PXA168
ARM: mmp: add usb device support for ttc dkb
ARM: mmp: add usb device support for PXA910
ARM: pxa: hx4700: Add PCMCIA/CF support
ARM: pxa: hx4700: Enable ASIC3 GPIO as a wakeup source
ARM: pxa: hx4700: Initialize DS1WM clock_rate
ARM: pxa: mioa701 add camera output enable gpio
ARM: pxa: use ioremap to access CPLD
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-imx')
0 files changed, 0 insertions, 0 deletions