diff options
| author | Olof Johansson <olof@lixom.net> | 2017-06-18 18:55:12 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-06-18 18:55:12 -0700 |
| commit | 51b6e2813ca1d7cb530d5f834ea22f1ae52b7e35 (patch) | |
| tree | 6c7218d3c009f98d5cbc2be46f020e590b12ca8a /net/sched/sch_netem.c | |
| parent | 151d1d752bb681f29898c68c966f6e17b446456c (diff) | |
| parent | db145db99f5bf30acc12d7450b9ad0707072a7be (diff) | |
| download | linux-51b6e2813ca1d7cb530d5f834ea22f1ae52b7e35.tar.gz linux-51b6e2813ca1d7cb530d5f834ea22f1ae52b7e35.tar.bz2 linux-51b6e2813ca1d7cb530d5f834ea22f1ae52b7e35.zip | |
Merge tag 'omap-for-v4.12/fixes-sl50' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
Two fixes for am335x-sl50 to fix a boot time error
for claiming SPI pins, and to fix a SDIO card detect
pin for production version of the device.
* tag 'omap-for-v4.12/fixes-sl50' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: dts: am335x-sl50: Fix cannot claim requested pins for spi0
ARM: dts: am335x-sl50: Fix card detect pin for mmc1
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'net/sched/sch_netem.c')
0 files changed, 0 insertions, 0 deletions