diff options
| author | Jens Axboe <axboe@kernel.dk> | 2013-12-31 17:51:02 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2013-12-31 17:51:02 +0100 |
| commit | b28bc9b38c52f63f43e3fd875af982f2240a2859 (patch) | |
| tree | 76cdb7b52b58f5685993cc15ed81d1c903023358 /arch/powerpc/boot/dts/xcalibur1501.dts | |
| parent | dm cache: increment bi_remaining when bi_end_io is restored (diff) | |
| parent | Linux 3.13-rc6 (diff) | |
| download | linux-b28bc9b38c52f63f43e3fd875af982f2240a2859.tar.xz linux-b28bc9b38c52f63f43e3fd875af982f2240a2859.zip | |
Merge tag 'v3.13-rc6' into for-3.14/core
Needed to bring blk-mq uptodate, since changes have been going in
since for-3.14/core was established.
Fixup merge issues related to the immutable biovec changes.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Conflicts:
block/blk-flush.c
fs/btrfs/check-integrity.c
fs/btrfs/extent_io.c
fs/btrfs/scrub.c
fs/logfs/dev_bdev.c
Diffstat (limited to 'arch/powerpc/boot/dts/xcalibur1501.dts')
| -rw-r--r-- | arch/powerpc/boot/dts/xcalibur1501.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/boot/dts/xcalibur1501.dts b/arch/powerpc/boot/dts/xcalibur1501.dts index cc00f4ddd9a7..c409cbafb126 100644 --- a/arch/powerpc/boot/dts/xcalibur1501.dts +++ b/arch/powerpc/boot/dts/xcalibur1501.dts @@ -637,14 +637,14 @@ tlu@2f000 { compatible = "fsl,mpc8572-tlu", "fsl_tlu"; reg = <0x2f000 0x1000>; - interupts = <61 2 >; + interrupts = <61 2>; interrupt-parent = <&mpic>; }; tlu@15000 { compatible = "fsl,mpc8572-tlu", "fsl_tlu"; reg = <0x15000 0x1000>; - interupts = <75 2>; + interrupts = <75 2>; interrupt-parent = <&mpic>; }; }; |