]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'mvebu/drivers' into for-next
authorJason Cooper <jason@lakedaemon.net>
Mon, 19 Aug 2013 21:27:02 +0000 (21:27 +0000)
committerJason Cooper <jason@lakedaemon.net>
Mon, 19 Aug 2013 21:27:02 +0000 (21:27 +0000)
1  2 
arch/arm/mach-mvebu/platsmp.c
drivers/pci/host/pci-mvebu.c

Simple merge
Simple merge