From: Jason Cooper <jason@lakedaemon.net>
Date: Mon, 19 Aug 2013 21:29:20 +0000 (+0000)
Subject: Merge branch 'mvebu/dove_pcie-mbus-dt' into for-next
X-Git-Tag: next-20130822~13^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=782371b2c2eddcc95db19318159d5e0631b9bfac;p=karo-tx-linux.git

Merge branch 'mvebu/dove_pcie-mbus-dt' into for-next

Conflicts:
	drivers/pci/host/pci-mvebu.c
---

782371b2c2eddcc95db19318159d5e0631b9bfac