aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/scsi/osst.txt
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-05-20 09:20:59 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-20 09:20:59 -0700
commitf39d01be4c59a61a08d0cb53f615e7016b85d339 (patch)
tree6777590e3ff2ddf4df1d38444ba7d692cd463b7b /Documentation/scsi/osst.txt
parent54291263519ac2c9bdda68b23b02fef3808deed4 (diff)
parent7db82437cfcac4bdfe79a6323eb554fdfa271623 (diff)
downloadkernel_samsung_espresso10-f39d01be4c59a61a08d0cb53f615e7016b85d339.zip
kernel_samsung_espresso10-f39d01be4c59a61a08d0cb53f615e7016b85d339.tar.gz
kernel_samsung_espresso10-f39d01be4c59a61a08d0cb53f615e7016b85d339.tar.bz2
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (44 commits) vlynq: make whole Kconfig-menu dependant on architecture add descriptive comment for TIF_MEMDIE task flag declaration. EEPROM: max6875: Header file cleanup EEPROM: 93cx6: Header file cleanup EEPROM: Header file cleanup agp: use NULL instead of 0 when pointer is needed rtc-v3020: make bitfield unsigned PCI: make bitfield unsigned jbd2: use NULL instead of 0 when pointer is needed cciss: fix shadows sparse warning doc: inode uses a mutex instead of a semaphore. uml: i386: Avoid redefinition of NR_syscalls fix "seperate" typos in comments cocbalt_lcdfb: correct sections doc: Change urls for sparse Powerpc: wii: Fix typo in comment i2o: cleanup some exit paths Documentation/: it's -> its where appropriate UML: Fix compiler warning due to missing task_struct declaration UML: add kernel.h include to signal.c ...
Diffstat (limited to 'Documentation/scsi/osst.txt')
-rw-r--r--Documentation/scsi/osst.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/scsi/osst.txt b/Documentation/scsi/osst.txt
index f536907..2b21890 100644
--- a/Documentation/scsi/osst.txt
+++ b/Documentation/scsi/osst.txt
@@ -40,7 +40,7 @@ behavior looks very much the same as st to the userspace applications.
History
-------
-In the first place, osst shared it's identity very much with st. That meant
+In the first place, osst shared its identity very much with st. That meant
that it used the same kernel structures and the same device node as st.
So you could only have either of them being present in the kernel. This has
been fixed by registering an own device, now.