Merge branches 'pxa-core' and 'pxa-machines' into pxa-all
[linux-2.6] / include / asm-um / setup.h
2005-06-15  Tony LuckAuto merge with /home/aegl/GIT/linus
2005-06-02  Dave KleikampMerge with /home/shaggy/git/linus-clean/
2005-05-27  Christoph HellwigMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-05-21  Anton AltaparmakovMerge with /usr/src/ntfs-2.6.git
2005-05-20  James Bottomleymerge by hand - fix up rejections in Documentation...
2005-05-09  Tony LuckMerge with /home/aegl/GIT/linus
2005-05-08  David WoodhouseMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-05-07  Jeff Dike[PATCH] uml: command line handling cleanup
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2