tree 71cccf385d734bfc33e9cd4752b5046aef99c130
parent b70a6b27ed4cbb9ea7a4e1abc080ed65692ecb9b
parent 43a49cbdf31e812c0d8f553d433b09b421f5d52c
author Linus Torvalds <torvalds@linux-foundation.org> 1225132911 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1225132911 -0700

Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  libata: fix NCQ devices behind port multipliers
  scsi: make sure that scsi_init_shared_tag_map() doesn't overwrite existing map