]> www.infradead.org Git - users/hch/dma-mapping.git/commitdiff
projects / users / hch / dma-mapping.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4148df9 ebbb16b)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 6 Jul 2009 21:03:44 +0000 (14:03 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 6 Jul 2009 21:03:44 +0000 (14:03 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
  ieee1394: sbp2: add support for disks >2 TB (and 16 bytes long CDBs)
  firewire: sbp2: add support for disks >2 TB (and 16 bytes long CDBs)
  firewire: core: do not DMA-map stack addresses

1  2 
drivers/firewire/sbp2.c patch | diff1 | diff2 | blob | history
drivers/ieee1394/sbp2.c patch | diff1 | diff2 | blob | history

diff --cc drivers/firewire/sbp2.c
Simple merge
diff --cc drivers/ieee1394/sbp2.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.