From: Linus Torvalds 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: 2.1b_release~11976 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f63bafe55654caf3a62f73500eafd1b89ca6f7ff;p=platform%2Fkernel%2Fkernel-mfld-blackbay.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