Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
[safe/jmp/linux-2.6] / arch / um / Kconfig.x86
2008-10-23 Al Virox86, um: get rid of arch/um/Kconfig.arch
2008-10-23 Al Virox86, um: merge Kconfig.i386 and Kconfig.x86_64