Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
[linux-2.6] / drivers / scsi / 53c7xx_d.h_shipped
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2