]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'mvebu/pcie' into for-next
authorJason Cooper <jason@lakedaemon.net>
Thu, 13 Jun 2013 18:03:15 +0000 (18:03 +0000)
committerJason Cooper <jason@lakedaemon.net>
Thu, 13 Jun 2013 18:03:15 +0000 (18:03 +0000)
commit5caaa6f6ed590ef7da6d468bf4749a3eb05fc326
treeeb2ebbc039de772fda19ef6d77737f96fa0845e6
parentfcd14a7f41aa7fb886fa7407892295f3b178eaff
parent3d9939c92efdd4ced672b94994959ca71b141cb8
Merge branch 'mvebu/pcie' into for-next

Conflicts:
arch/arm/mach-mvebu/Kconfig
arch/arm/mach-mvebu/Kconfig