summaryrefslogtreecommitdiff
path: root/drivers/net/macvtap.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2013-05-22 09:52:32 (GMT)
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-05-22 09:53:20 (GMT)
commit78ecad0183bd7e49131da2b5aa82bee017db1cf0 (patch)
tree4059732146dd410d134fbc9eddfbb3f79ef509a5 /drivers/net/macvtap.c
parentf150abe1012f2fc7d444d33d651db32435038c11 (diff)
parentb382b940f821784107ca22de3455bb90e4512557 (diff)
downloadlinux-78ecad0183bd7e49131da2b5aa82bee017db1cf0.tar.xz
Merge tag '3.10-rc2-psci-ops-11-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/sstabellini/xen into devel-stable
Pull psci_smp_ops support from Stefano Stabellini: It contains the generic PSCI patch and the smp_init patch that we discussed so much about. I think it would be helpful for other people if you could create a stable branch with these patches so that SoC devs can base their work on it.
Diffstat (limited to 'drivers/net/macvtap.c')
0 files changed, 0 insertions, 0 deletions