Merge branch 'master'
[linux-2.6] / include / asm-um / delay.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-21  Anton AltaparmakovMerge with /usr/src/ntfs-2.6.git
2005-05-20  James Bottomleymerge by hand - fix up rejections in Documentation...
2005-05-06  Linus TorvaldsMerge ... parisc-linux.org/~jejb/git/scsi-for-linus...
2005-05-05  Bodo Stroesser[PATCH] uml: s390 preparation, delay moved to arch
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2