]> rtime.felk.cvut.cz Git - linux-imx.git/commitdiff
Merge tag 'pcie_kw-3.11-2' of git://git.infradead.org/users/jcooper/linux into next/soc
authorOlof Johansson <olof@lixom.net>
Tue, 11 Jun 2013 04:50:49 +0000 (21:50 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 11 Jun 2013 05:00:59 +0000 (22:00 -0700)
From Jason Cooper:
mvebu pcie driver (kirkwood) for v3.11 (round 2)
 - kirkwood
    - migrate Netgear ReadyNAS Duo v2 to pcie DT init

* tag 'pcie_kw-3.11-2' of git://git.infradead.org/users/jcooper/linux:
  arm: kirkwood: NETGEAR ReadyNAS Duo v2 init PCIe via DT

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

Trivial merge