aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-04-08 12:42:16 -0400
committerArnd Bergmann <arnd@arndb.de>2013-04-08 12:42:16 -0400
commitc985d7e325fd5c2bf78de2f705f6001bce143a26 (patch)
tree6580bc32fd6f27fbd6a486ac741d8f562271af6a /drivers/staging
parente382328a811fd6ffdb77ee16ff6a9e92e07561c5 (diff)
parentc7c28b0fdd06d8eb9414d21f8956b7c773ceea93 (diff)
Merge branch 'zynq/core-smp' of git://git.xilinx.com/linux-xlnx into next/soc2
From Michal Simek <michal.simek@xilinx.com>: This branch is based on zynq/clksrc/cleanup parts because there are some dependencies on moving timer to generic location. I could based it on standard Linux tagged version but you will get several conflicts you will have to resolve. If you are OK to resolving these problems, please let me know I will create another branch with core-smp changes which are not based on zynq/clksrc/cleanup branch. * 'zynq/core-smp' of git://git.xilinx.com/linux-xlnx: arm: zynq: Add hotplug support arm: zynq: Add smp support arm: zynq: Add smp_twd timer arm: zynq: Get rid of xilinx function prefix arm: zynq: Add support for system reset arm: zynq: Move slcr initialization to separate file arm: zynq: Load scu baseaddress at run time Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/staging')
0 files changed, 0 insertions, 0 deletions