From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 6 Jul 2009 21:03:44 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394... 
X-Git-Tag: MMI-PSA29.97-13-9~27475
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f63bafe55654caf3a62f73500eafd1b89ca6f7ff;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'for-linus' of git://git./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
---

f63bafe55654caf3a62f73500eafd1b89ca6f7ff