Merge branch 'fixes' into for-next

Browse source

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

...

This commit is contained in:

Arnd Bergmann 2017-12-07 15:55:08 +01:00

parent ee4c54d091 863204cfda

commit 8b6eac70ae

2 changed files with 3 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

arch/arm/boot/dts/nspire.dtsi

View file

2

arch/arm/mach-omap2/omap-secure.c

View file