tree addbc37a278a126a19e03edd8270e577c75a8829
parent 8d4ee71ff6de5255ebfdf44fb83419d27bd06368
parent e2a7f77a7b4ab298a38c8d1f624628456069bdb0
author Jeff Garzik <jeff@garzik.org> 1148099768 -0400
committer Jeff Garzik <jeff@garzik.org> 1148099768 -0400

Merge branch 'upstream-fixes' into upstream

Conflicts:

	drivers/scsi/libata-core.c