Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
[linux-3.10.git] / arch / ia64 / hp / zx1 /
2005-04-16 Linus Torvalds Linux-2.6.12-rc2 master