Skip to content
Commit 396d81cd authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'at91/dt' into next/dt



This should help the merge with the at91 adc driver that is currently
in the staging tree.

* at91/dt:
  ARM: at91: Add ADC driver to at91sam9260/at91sam9g20 dtsi files

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 86e43a7a 73d68d91
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment