Merge branch 'fixes' into for-next
authorArnd Bergmann <arnd@arndb.de>
Thu, 7 Dec 2017 14:55:08 +0000 (15:55 +0100)
committerArnd Bergmann <arnd@arndb.de>
Thu, 7 Dec 2017 14:55:08 +0000 (15:55 +0100)
commit8b6eac70ae3e8bb46e02a04e421e9db7a9b24d6f
treee2769c379d5c934cdafb4694344f8c5a4eef64f6
parentee4c54d0912713f69da51bca922735846fac25a8
parent863204cfdae98626a92535ac928ad79f4d6b74ff
Merge branch 'fixes' into for-next

* fixes:
  ARM: omap2: hide omap3_save_secure_ram on non-OMAP3 builds
  arm: dts: nspire: Add missing #phy-cells to usb-nop-xceiv