Merge branch 'x86/setup' into x86/devel
[firefly-linux-kernel-4.4.55.git] / arch / um / Makefile-ppc
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2