Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
[linux-2.6] / drivers / scsi / atari_NCR5380.c
2005-11-21  David S. MillerMerge git://git.skbuff.net/gitroot/yoshfuji/linux-2...
2005-11-18  Linus TorvaldsMerge branch 'for-linus' of /linux/kernel/git/roland...
2005-11-15  Linus TorvaldsMerge x86-64 update from Andi
2005-11-13  Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-11-12  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-11-12  Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2005-11-12  Linus TorvaldsMerge git://git./linux/kernel/git/bunk/trivial
2005-11-11  Linus TorvaldsMerge /linux/kernel/git/jejb/scsi-for-linus-2.6
2005-11-10  James BottomleyMerge by hand (whitespace conflicts in libata.h)
2005-11-09  Christoph Hellwig[SCSI] remove Scsi_Host_Template typedef
2005-04-18  Linus TorvaldsMerge ... kernel.org:/home/rmk/linux-2.6-rmk.git
2005-04-18  Linus TorvaldsMerge SCSI tree from James Bottomley.
2005-04-18  James Bottomleymerge by hand (scsi_device.h)
2005-04-18   <hch@lst.de>[PATCH] remove outdated print_* functions
2005-04-17   <hch@lst.de>[PATCH] remove outdated print_* functions
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2