tree d8c80b71e1197fb805c07282139377e9542421ea
parent 4148df9b0f38bdd362dd91d52076926c11cbe5a9
parent ebbb16bffa646f853899ef3fdc0ac7abab888703
author Linus Torvalds <torvalds@linux-foundation.org> 1246914224 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1246914224 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6

* '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