summaryrefslogtreecommitdiff
path: root/fs/nfs
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-11-26 01:04:39 -0800
committerOlof Johansson <olof@lixom.net>2012-11-26 01:04:39 -0800
commit0d5c2e21d3151f13812bc562544f5eda9c9c9abc (patch)
treef0db9a6df5a29a7daaa25cf3bd942a496cf637e6 /fs/nfs
parent48b71e3ac138469e83d044db22020424aaa44753 (diff)
parentf17073a3aec601cb9aba6d8c1c6dbc8c6a919c07 (diff)
downloadlinux-3.10-0d5c2e21d3151f13812bc562544f5eda9c9c9abc.tar.gz
linux-3.10-0d5c2e21d3151f13812bc562544f5eda9c9c9abc.tar.bz2
linux-3.10-0d5c2e21d3151f13812bc562544f5eda9c9c9abc.zip
Merge tag 'orion_boards_for_3.8' of git://git.infradead.org/users/jcooper/linux into next/boards
From Jason Cooper: orion boards for v3.8 - mach-orion5x/ joins the dark side! (devicetree) - Lacie Network Space family - Lacie Ethernet Disk mini v2 - USI TopKick - ZyXEL NSA310 - MPL CEC4 - Plat'Home OpenBlocks A6 (kirkwood, AX3-4 is armada xp) * tag 'orion_boards_for_3.8' of git://git.infradead.org/users/jcooper/linux: ARM: kirkwood: Add Plat'Home OpenBlocks A6 support ARM: Dove: update defconfig ARM: Kirkwood: update defconfig for new boards arm: orion5x: add DT related options in defconfig arm: orion5x: convert 'LaCie Ethernet Disk mini v2' to Device Tree arm: orion5x: basic Device Tree support arm: orion5x: mechanical defconfig update ARM: kirkwood: Add support for the MPL CEC4 arm: kirkwood: add support for ZyXEL NSA310 ARM: Kirkwood: new board USI Topkick ARM: kirkwood: use gpio-fan DT binding on lsxl ARM: Kirkwood: add Netspace boards to defconfig ARM: kirkwood: DT board setup for Network Space Mini v2 ARM: kirkwood: DT board setup for Network Space Lite v2 ARM: kirkwood: DT board setup for Network Space v2 and parents leds: leds-ns2: add device tree binding ARM: Kirkwood: Enable the second I2C bus
Diffstat (limited to 'fs/nfs')
0 files changed, 0 insertions, 0 deletions