Merge tag 'at91-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux...
authorOlof Johansson <olof@lixom.net>
Wed, 13 Apr 2016 16:59:50 +0000 (09:59 -0700)
committerOlof Johansson <olof@lixom.net>
Wed, 13 Apr 2016 16:59:50 +0000 (09:59 -0700)
commit49ad80df2629a4627d2d8efe544c58ed0798c902
tree55ccb6f2b3e2ddbe2877bc93f3e7ffff01685bc5
parentbf16200689118d19de1b8d2a3c314fc21f5dc7bb
parentc07f98a73978964065b57079cae9ab9d060769fe
Merge tag 'at91-soc' of git://git./linux/kernel/git/nferre/linux-at91 into next/soc

First SoC batch for 4.7:
- chipid registers reading for SoC detection

* tag 'at91-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
  ARM: at91/soc: reference the whole sama5d2 family
  ARM: at91: use chipid device for soc detection

Signed-off-by: Olof Johansson <olof@lixom.net>