diff options
| author | Jens Axboe <axboe@fb.com> | 2014-09-11 17:31:18 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2014-09-11 17:31:18 +0200 |
| commit | b207892b061da7608878e273ae22ba9bf9be264b (patch) | |
| tree | 51daa46b89b83cad422941f52110b19571b85b79 /arch/arm/boot/dts/omap3-n900.dts | |
| parent | bdi: reimplement bdev_inode_switch_bdi() (diff) | |
| parent | blk-mq: scale depth and rq map appropriate if low on memory (diff) | |
| download | linux-b207892b061da7608878e273ae22ba9bf9be264b.tar.xz linux-b207892b061da7608878e273ae22ba9bf9be264b.zip | |
Merge branch 'for-linus' into for-3.18/core
A bit of churn on the for-linus side that would be nice to have
in the core bits for 3.18, so pull it in to catch us up and make
forward progress easier.
Signed-off-by: Jens Axboe <axboe@fb.com>
Conflicts:
block/scsi_ioctl.c
Diffstat (limited to 'arch/arm/boot/dts/omap3-n900.dts')
| -rw-r--r-- | arch/arm/boot/dts/omap3-n900.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts index b15f1a77d684..1fe45d1f75ec 100644 --- a/arch/arm/boot/dts/omap3-n900.dts +++ b/arch/arm/boot/dts/omap3-n900.dts @@ -353,7 +353,7 @@ }; twl_power: power { - compatible = "ti,twl4030-power-n900"; + compatible = "ti,twl4030-power-n900", "ti,twl4030-power-idle-osc-off"; ti,use_poweroff; }; }; |