summaryrefslogtreecommitdiffstats
path: root/arch/x86/um/Kconfig
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmare...Linus Torvalds2011-11-061-3/+0
* um: take arch/um/sys-x86 to arch/x86/umAl Viro2011-11-021-0/+70