aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/nilfs2_fs.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-07-06 17:03:44 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-07-06 17:03:44 -0400
commitf63bafe55654caf3a62f73500eafd1b89ca6f7ff (patch)
treed8c80b71e1197fb805c07282139377e9542421ea /include/linux/nilfs2_fs.h
parent4148df9b0f38bdd362dd91d52076926c11cbe5a9 (diff)
parentebbb16bffa646f853899ef3fdc0ac7abab888703 (diff)
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
Diffstat (limited to 'include/linux/nilfs2_fs.h')
0 files changed, 0 insertions, 0 deletions