Automatic merge of /spare/repo/netdev-2.6 branch viro
[linux-2.6] / include / asm-um / setup.h
2005-05-27  Christoph HellwigMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-05-09  Tony LuckMerge with /home/aegl/GIT/linus
2005-05-07  Jeff Dike[PATCH] uml: command line handling cleanup
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2