Merge by hand (conflicts in scsi_lib.c)
[linux-2.6] / drivers / ide / pci / sis5513.c
2005-11-22  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2005-11-22  Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2005-11-21  Dave JonesMerge ../linus/
2005-11-21  David S. MillerMerge git://git.skbuff.net/gitroot/yoshfuji/linux-2...
2005-11-20  Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-11-20  Linus TorvaldsMerge /pub/scm/linux/kernel/git/bart/ide-2.6
2005-11-19  Aurelien Jarno[PATCH] sis5513: enable ATA133 for the SiS965 southbridge
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  Adrian Bunk[PATCH] drivers/ide/pci/sis5513.c: section fixes
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2