tree 02ec800bd9e2625b89757e2ba59f3b3c0f7c1236
parent d3fb4e8dddebbf7d6c0b02842c619bfd4fa199f5
parent bb31a8faa270beafcc51a65880c5564c6b718bd6
author Jeff Garzik <jeff@garzik.org> 1148449752 -0400
committer Jeff Garzik <jeff@garzik.org> 1148449752 -0400

Merge branch 'upstream-fixes' into upstream

Conflicts:

	drivers/scsi/libata-core.c