git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b70a6b2 43a49cb)
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Oct 2008 18:41:51 +0000 (11:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Oct 2008 18:41:51 +0000 (11:41 -0700)
* '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


Trivial merge
Pandora Kernel Repository