diff options
| author | Olof Johansson <olof@lixom.net> | 2019-05-16 08:22:52 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2019-05-16 19:53:18 +0200 |
| commit | 163d65cbf3bace75f6b0bc83fa4e8ca8795579cf (patch) | |
| tree | 76ea133868ef4080bbd471b74900964b3c6c2e81 /fs/orangefs | |
| parent | ARM: ixp4xx: Remove duplicated include from common.c (diff) | |
| parent | ARM: dts: logicpd-som-lv: Fix MMC1 card detect (diff) | |
| download | linux-163d65cbf3bace75f6b0bc83fa4e8ca8795579cf.tar.xz linux-163d65cbf3bace75f6b0bc83fa4e8ca8795579cf.zip | |
Merge tag 'omap-for-v5.1/fixes-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/late
Two regression fixes for omaps
Two one-liners to fix board-ams-delta booting regression and
logicpd-som-lv MMC card detect to use GPIO_ACTIVE_LOW instead of
IRQ_TYPE_LEVEL_LOW. Note that the board-ams-delta regression has
been in there already since v5.0, so if necessary these can wait
for the merge window.
* tag 'omap-for-v5.1/fixes-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: dts: logicpd-som-lv: Fix MMC1 card detect
ARM: OMAP1: ams-delta: fix early boot crash when LED support is disabled
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'fs/orangefs')
0 files changed, 0 insertions, 0 deletions