diff options
| author |   Olof Johansson <olof@lixom.net> | 2012-05-09 02:50:32 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-05-09 02:50:32 -0700 |
| commit | f1a9fa2381d844bca66cefc842cbb65b263d74dc (patch) | |
| tree | ec0e29fdfb2977997155c2cc14ebf242acfd3913 /fs/nfs/proc.c | |
| parent | Merge tag 'imx-features-board-20120411-2' of git://git.pengutronix.de/git/imx/linux-2.6 into next/boards (diff) | |
| parent | pcmcia: add driver for hx4700 (diff) | |
| download | wireguard-linux-f1a9fa2381d844bca66cefc842cbb65b263d74dc.tar.xz wireguard-linux-f1a9fa2381d844bca66cefc842cbb65b263d74dc.zip | |
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 'fs/nfs/proc.c')
0 files changed, 0 insertions, 0 deletions