diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-04-22 20:12:57 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-05-09 09:14:11 (GMT) |
| commit | 02abb80f9003b20257fef399a6bb0e0425e69bc2 (patch) | |
| tree | 57aceb367088e2e36c2283b57f5b956d6247b502 /fs/btrfs/volumes.c | |
| parent | 244cf2533ca91d7f6a4ed0a7e81df4bf93246c91 (diff) | |
| parent | 3b7b70552afe351a8bd8fff1eb2d60aab2206576 (diff) | |
| download | linux-fsl-qoriq-02abb80f9003b20257fef399a6bb0e0425e69bc2.tar.xz | |
Merge branch 'renesas/dt' into next/dt
First part of DT changes for the Renesas shmobile platform,
pulled from:
git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas.git dt
* renesas/dt:
ARM: mach-shmobile: sh7372 generic board support via DT V2
ARM: mach-shmobile: Rework sh7372 INTCS demuxer V2
ARM: mach-shmobile: Use INTC_IRQ_PINS_16H on sh7372
ARM: mach-shmobile: Use 0x3400 as INTCS vector offset
ARM: mach-shmobile: Introduce INTC_IRQ_PINS_16H
ARM: mach-shmobile: Introduce shmobile_setup_delay()
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
[olof: rebuilt branch due to drop of an early merge]
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'fs/btrfs/volumes.c')
0 files changed, 0 insertions, 0 deletions