tree d3a08af50624d9b3e2287367b7e9f5fcc93bdce5
parent 33ddcbbfb1d9f1bf1259531ae0ba8400ea3c8ba1
parent 8a87a0b6313109d2fea87b1271d497c954ce2ca8
author Linus Torvalds <torvalds@g5.osdl.org> 1131746677 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> 1131746677 -0800

Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6