aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/DocBook
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'driver-core-linus' of ↵Linus Torvalds2011-11-211-1/+6
|\ | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core * 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: drivers/base/node.c: fix compilation error with older versions of gcc uio: documentation fixups device.h: Fix struct member documentation
| * uio: documentation fixupsGeoff Thorpe2011-11-151-1/+6
| | | | | | | | | | | | | | | | | | The 'name' attribute of struct uio_mem wasn't documented, and the note about 'kobj' is stale and needs to be changed to 'map'. Signed-off-by: Geoff Thorpe <geoff@geoffthorpe.net> Signed-off-by: "Hans J. Koch" <hjk@hansjkoch.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | Merge branch 'docs-move' of ↵Linus Torvalds2011-11-081-140/+168
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs * 'docs-move' of git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs: (45 commits) DocBook/drm: Clean up a todo-note DocBook/drm: `device aware' -> `device-aware' DocBook/drm: `(device|driver) specific' -> `(device|driver)-specific' DocBook/drm: Clean up the paragraph on framebuffer objects DocBook/drm: Use `; otherwise,' DocBook/drm: Better flow with `, and then' DocBook/drm: Refer to the domain-setting function as a device-specific ioctl DocBook/drm: Improve flow of GPU/CPU coherence sentence DocBook/drm: Use an <itemizelist> for fundamental GEM operations DocBook/drm: Insert a comma DocBook/drm: Use a <variablelist> for vblank ioctls DocBook/drm: Use an itemizedlist for what an encoder needs to provide DocBook/drm: Insert `the' for readability, and change `set' to `setting' DocBook/drm: Remove extraneous commas DocBook/drm: Use a colon DocBook/drm: Clarify `final initialization' via better formatting DocBook/drm: Remove redundancy DocBook/drm: Insert `it' for smooth reading DocBook/drm: The word `so-called'; I do not think it connotes what you think it connotes DocBook/drm: Use a singular subject for grammatical cleanliness ...
| * Merge branch 'docs/docbook/drm' of git://github.com/mfwitten/linux into ↵Randy Dunlap2011-11-061-140/+168
| |\ | | | | | | | | | docs-move
| | * DocBook/drm: Clean up a todo-noteMichael Witten2011-08-291-2/+2
| | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * DocBook/drm: `device aware' -> `device-aware'Michael Witten2011-08-291-1/+1
| | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * DocBook/drm: `(device|driver) specific' -> `(device|driver)-specific'Michael Witten2011-08-291-17/+17
| | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * DocBook/drm: Clean up the paragraph on framebuffer objectsMichael Witten2011-08-291-8/+6
| | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * DocBook/drm: Use `; otherwise,'Michael Witten2011-08-291-1/+1
| | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * DocBook/drm: Better flow with `, and then'Michael Witten2011-08-291-2/+2
| | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * DocBook/drm: Refer to the domain-setting function as a device-specific ioctlMichael Witten2011-08-291-3/+3
| | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * DocBook/drm: Improve flow of GPU/CPU coherence sentenceMichael Witten2011-08-291-2/+3
| | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * DocBook/drm: Use an <itemizelist> for fundamental GEM operationsMichael Witten2011-08-291-3/+7
| | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * DocBook/drm: Insert a commaMichael Witten2011-08-291-1/+1
| | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * DocBook/drm: Use a <variablelist> for vblank ioctlsMichael Witten2011-08-291-14/+25
| | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * DocBook/drm: Use an itemizedlist for what an encoder needs to provideMichael Witten2011-08-291-11/+19
| | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * DocBook/drm: Insert `the' for readability, and change `set' to `setting'Michael Witten2011-08-291-2/+2
| | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * DocBook/drm: Remove extraneous commasMichael Witten2011-08-291-2/+2
| | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * DocBook/drm: Use a colonMichael Witten2011-08-291-1/+1
| | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * DocBook/drm: Clarify `final initialization' via better formattingMichael Witten2011-08-291-4/+13
| | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * DocBook/drm: Remove redundancyMichael Witten2011-08-291-2/+1
| | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * DocBook/drm: Insert `it' for smooth readingMichael Witten2011-08-291-1/+1
| | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * DocBook/drm: The word `so-called'; I do not think it connotes what you think ↵Michael Witten2011-08-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it connotes From Webster's Revised Unabridged Dictionary (1913) [web1913]: So-called \So"-called`\, a. So named; called by such a name (but perhaps called thus with doubtful propriety). From WordNet (r) 2.0 [wn]: so-called adj : doubtful or suspect; "these so-called experts are no help" [syn: {alleged(a)}, {supposed}] My strong conviction is that widespread use of 'so gennant' or 'sogennant' in German has led to the creeping misuse of 'so-called' in English (especially through technical writings). In English, it would be better to use: what is called or a better translation of 'so gennant': so named Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * DocBook/drm: Use a singular subject for grammatical cleanlinessMichael Witten2011-08-291-4/+4
| | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * DocBook/drm: basic -> coreMichael Witten2011-08-291-1/+1
| | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * DocBook/drm: Streamline wording of GEM initializationMichael Witten2011-08-291-1/+1
| | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * DocBook/drm: Insert `()' after function nameMichael Witten2011-08-291-4/+4
| | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * DocBook/drm: Remove parentheses and unnecessary repetitionMichael Witten2011-08-291-2/+2
| | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * DocBook/drm: Insert missing commaMichael Witten2011-08-291-5/+5
| | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * DocBook/drm: , -> :Michael Witten2011-08-291-2/+2
| | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * DocBook/drm: can -> couldMichael Witten2011-08-291-1/+1
| | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * DocBook/drm: Offset modifiers with commasMichael Witten2011-08-291-4/+4
| | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * DocBook/drm: Use the passive voiceMichael Witten2011-08-291-3/+3
| | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * DocBook/drm: `at driver load time' -> `when the driver is loaded'Michael Witten2011-08-291-1/+1
| | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * DocBook/drm: `setup' is the noun; `to set up' is the verbMichael Witten2011-08-291-1/+1
| | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * DocBook/drm: Insert missing `an'Michael Witten2011-08-291-1/+1
| | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * DocBook/drm: Insert missing `that'Michael Witten2011-08-291-2/+2
| | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * DocBook/drm: Clearer wording with `for consumption by'Michael Witten2011-08-291-2/+2
| | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * DocBook/drm: Better wordingMichael Witten2011-08-291-2/+2
| | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * DocBook/drm: Replace the paragraph's first sentence with its last sentenceMichael Witten2011-08-291-7/+5
| | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * DocBook/drm: Rearrange wording to make more senseMichael Witten2011-08-291-3/+3
| | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * DocBook/drm: Clean up `pre-memory management aware'Michael Witten2011-08-291-1/+1
| | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * DocBook/drm: Move `should be set' to the beginning of the sentenceMichael Witten2011-08-291-2/+2
| | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * DocBook/drm: , -> .Michael Witten2011-08-291-1/+1
| | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * DocBook/drm: a -> anMichael Witten2011-08-291-1/+1
| | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * DocBook/drm: Use a semicolonMichael Witten2011-08-291-4/+4
| | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * DocBook/drm: Clean up code commentMichael Witten2011-08-291-2/+2
| | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * DocBook/drm: can -> mayMichael Witten2011-08-251-10/+10
| | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
| | * DocBook/drm: Eradicate inappropriate uses of the future tenseMichael Witten2011-08-251-25/+25
| | | | | | | | | | | | Signed-off-by: Michael Witten <mfwitten@gmail.com>
* | | Merge git://git.infradead.org/mtd-2.6Linus Torvalds2011-11-071-18/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.infradead.org/mtd-2.6: (226 commits) mtd: tests: annotate as DANGEROUS in Kconfig mtd: tests: don't use mtd0 as a default mtd: clean up usage of MTD_DOCPROBE_ADDRESS jffs2: add compr=lzo and compr=zlib options jffs2: implement mount option parsing and compression overriding mtd: nand: initialize ops.mode mtd: provide an alias for the redboot module name mtd: m25p80: don't probe device which has status of 'disabled' mtd: nand_h1900 never worked mtd: Add DiskOnChip G3 support mtd: m25p80: add EON flash EN25Q32B into spi flash id table mtd: mark block device queue as non-rotational mtd: r852: make r852_pm_ops static mtd: m25p80: add support for at25df321a spi data flash mtd: mxc_nand: preset_v1_v2: unlock all NAND flash blocks mtd: nand: switch `check_pattern()' to standard `memcmp()' mtd: nand: invalidate cache on unaligned reads mtd: nand: do not scan bad blocks with NAND_BBT_NO_OOB set mtd: nand: wait to set BBT version mtd: nand: scrub BBT on ECC errors ... Fix up trivial conflicts: - arch/arm/mach-at91/board-usb-a9260.c Merged into board-usb-a926x.c - drivers/mtd/maps/lantiq-flash.c add_mtd_partitions -> mtd_device_register vs changed to use mtd_device_parse_register.