Merge branch 'marvell-doc' of git://github.com/MISL-EBU-System-SW/mainline-public...
authorArnd Bergmann <arnd@arndb.de>
Mon, 13 Aug 2012 14:39:26 +0000 (16:39 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 13 Aug 2012 14:39:26 +0000 (16:39 +0200)
commitc1faefbb5ba24957e0e5b519adf0e128380f49de
tree9c2605ca44a891b3e1434d0af1b5f44547b80c5d
parent0d7614f09c1ebdbaa1599a5aba7593f147bf96ee
parent9ee99783d7571d7e1ca8540e82b21f51b69595f4
Merge branch 'marvell-doc' of git://github.com/MISL-EBU-System-SW/mainline-public into next/docs

* 'marvell-doc' of git://github.com/MISL-EBU-System-SW/mainline-public:
  arm: add documentation describing Marvell families of SoC

Signed-off-by: Arnd Bergmann <arnd@arndb.de>