diff options
author | Mark Brown <broonie@kernel.org> | 2017-02-16 20:11:56 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2017-02-16 20:11:56 +0000 |
commit | b5d86c7f23bdeb07defe25028a476de14327f355 (patch) | |
tree | c0340c233f7ebc19144b45358997eb0a423d3655 /arch/x86/kvm/debugfs.c | |
parent | 34671288be6428a9516c68e4475ff30e8d7c6492 (diff) | |
parent | 66459c5a50a787c474b734b586328f7111ab6df0 (diff) | |
parent | 17f84b793c01452e8802ef80324863b8da7d900b (diff) | |
parent | 9c4f0440ba8f3ad57bebb46cfa29a18333fe4860 (diff) | |
parent | 797236f10a095a1742373bca5f284c5ec8afb446 (diff) | |
parent | 64e02cb0bdfc7cef0a01e2ad4d567fdc0a74450e (diff) |
Merge remote-tracking branches 'spi/topic/imx', 'spi/topic/lantiq-ssc', 'spi/topic/mpc52xx', 'spi/topic/ppc4xx' and 'spi/topic/pxa2xx' into spi-next