diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 20:40:58 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 20:40:58 -0500 |
| commit | 9afa3195b96da7d2320ec44d19fbfbded7a15571 (patch) | |
| tree | 15c4222de2a2b2814c9430dcb4e997b18597881c | |
| parent | 7c2db36e730ee4facd341679ecb21ee73ba92831 (diff) | |
| parent | df63447f1a4402d7d9c6a9cd1c39a6d6766452d1 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree from Jiri Kosina:
"Assorted tiny fixes queued in trivial tree"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (22 commits)
DocBook: update EXPORT_SYMBOL entry to point at export.h
Documentation: update top level 00-INDEX file with new additions
ARM: at91/ide: remove unsused at91-ide Kconfig entry
percpu_counter.h: comment code for better readability
x86, efi: fix comment typo in head_32.S
IB: cxgb3: delay freeing mem untill entirely done with it
net: mvneta: remove unneeded version.h include
time: x86: report_lost_ticks doesn't exist any more
pcmcia: avoid static analysis complaint about use-after-free
fs/jfs: Fix typo in comment : 'how may' -> 'how many'
of: add missing documentation for of_platform_populate()
btrfs: remove unnecessary cur_trans set before goto loop in join_transaction
sound: soc: Fix typo in sound/codecs
treewide: Fix typo in various drivers
btrfs: fix comment typos
Update ibmvscsi module name in Kconfig.
powerpc: fix typo (utilties -> utilities)
of: fix spelling mistake in comment
h8300: Fix home page URL in h8300/README
xtensa: Fix home page URL in Kconfig
...
58 files changed, 215 insertions, 110 deletions
diff --git a/Documentation/00-INDEX b/Documentation/00-INDEX index 8afe64fb2009..0f3e8bbab8d7 100644 --- a/Documentation/00-INDEX +++ b/Documentation/00-INDEX | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | This is a brief list of all the files in ./linux/Documentation and what | 2 | This is a brief list of all the files in ./linux/Documentation and what |
| 3 | they contain. If you add a documentation file, please list it here in | 3 | they contain. If you add a documentation file, please list it here in |
| 4 | alphabetical order as well, or risk being hunted down like a rabid dog. | 4 | alphabetical order as well, or risk being hunted down like a rabid dog. |
| 5 | Please try and keep the descriptions small enough to fit on one line. | 5 | Please keep the descriptions small enough to fit on one line. |
| 6 | Thanks -- Paul G. | 6 | Thanks -- Paul G. |
| 7 | 7 | ||
| 8 | Following translations are available on the WWW: | 8 | Following translations are available on the WWW: |
| @@ -20,24 +20,33 @@ BUG-HUNTING | |||
| 20 | Changes | 20 | Changes |
| 21 | - list of changes that break older software packages. | 21 | - list of changes that break older software packages. |
| 22 | CodingStyle | 22 | CodingStyle |
| 23 | - how the boss likes the C code in the kernel to look. | 23 | - how the maintainers expect the C code in the kernel to look. |
| 24 | development-process/ | ||
| 25 | - An extended tutorial on how to work with the kernel development | ||
| 26 | process. | ||
| 27 | DMA-API.txt | 24 | DMA-API.txt |
| 28 | - DMA API, pci_ API & extensions for non-consistent memory machines. | 25 | - DMA API, pci_ API & extensions for non-consistent memory machines. |
| 26 | DMA-API-HOWTO.txt | ||
| 27 | - Dynamic DMA mapping Guide | ||
| 29 | DMA-ISA-LPC.txt | 28 | DMA-ISA-LPC.txt |
| 30 | - How to do DMA with ISA (and LPC) devices. | 29 | - How to do DMA with ISA (and LPC) devices. |
| 30 | DMA-attributes.txt | ||
| 31 | - listing of the various possible attributes a DMA region can have | ||
| 31 | DocBook/ | 32 | DocBook/ |
| 32 | - directory with DocBook templates etc. for kernel documentation. | 33 | - directory with DocBook templates etc. for kernel documentation. |
| 34 | EDID/ | ||
| 35 | - directory with info on customizing EDID for broken gfx/displays. | ||
| 33 | HOWTO | 36 | HOWTO |
| 34 | - the process and procedures of how to do Linux kernel development. | 37 | - the process and procedures of how to do Linux kernel development. |
| 35 | IPMI.txt | 38 | IPMI.txt |
| 36 | - info on Linux Intelligent Platform Management Interface (IPMI) Driver. | 39 | - info on Linux Intelligent Platform Management Interface (IPMI) Driver. |
| 37 | IRQ-affinity.txt | 40 | IRQ-affinity.txt |
| 38 | - how to select which CPU(s) handle which interrupt events on SMP. | 41 | - how to select which CPU(s) handle which interrupt events on SMP. |
| 42 | IRQ-domain.txt | ||
| 43 | - info on inerrupt numbering and setting up IRQ domains. | ||
| 39 | IRQ.txt | 44 | IRQ.txt |
| 40 | - description of what an IRQ is. | 45 | - description of what an IRQ is. |
| 46 | Intel-IOMMU.txt | ||
| 47 | - basic info on the Intel IOMMU virtualization support. | ||
| 48 | Makefile | ||
| 49 | - some files in Documentation dir are actually sample code to build | ||
| 41 | ManagementStyle | 50 | ManagementStyle |
| 42 | - how to (attempt to) manage kernel hackers. | 51 | - how to (attempt to) manage kernel hackers. |
| 43 | RCU/ | 52 | RCU/ |
| @@ -66,10 +75,16 @@ applying-patches.txt | |||
| 66 | - description of various trees and how to apply their patches. | 75 | - description of various trees and how to apply their patches. |
| 67 | arm/ | 76 | arm/ |
| 68 | - directory with info about Linux on the ARM architecture. | 77 | - directory with info about Linux on the ARM architecture. |
| 78 | arm64/ | ||
| 79 | - directory with info about Linux on the 64 bit ARM architecture. | ||
| 69 | atomic_ops.txt | 80 | atomic_ops.txt |
| 70 | - semantics and behavior of atomic and bitmask operations. | 81 | - semantics and behavior of atomic and bitmask operations. |
| 71 | auxdisplay/ | 82 | auxdisplay/ |
| 72 | - misc. LCD driver documentation (cfag12864b, ks0108). | 83 | - misc. LCD driver documentation (cfag12864b, ks0108). |
| 84 | backlight/ | ||
| 85 | - directory with info on controlling backlights in flat panel displays | ||
| 86 | bad_memory.txt | ||
| 87 | - how to use kernel parameters to exclude bad RAM regions. | ||
| 73 | basic_profiling.txt | 88 | basic_profiling.txt |
| 74 | - basic instructions for those who wants to profile Linux kernel. | 89 | - basic instructions for those who wants to profile Linux kernel. |
| 75 | binfmt_misc.txt | 90 | binfmt_misc.txt |
| @@ -80,8 +95,14 @@ block/ | |||
| 80 | - info on the Block I/O (BIO) layer. | 95 | - info on the Block I/O (BIO) layer. |
| 81 | blockdev/ | 96 | blockdev/ |
| 82 | - info on block devices & drivers | 97 | - info on block devices & drivers |
| 98 | braille-console.txt | ||
| 99 | - info on how to use serial devices for Braille support. | ||
| 100 | bt8xxgpio.txt | ||
| 101 | - info on how to modify a bt8xx video card for GPIO usage. | ||
| 83 | btmrvl.txt | 102 | btmrvl.txt |
| 84 | - info on Marvell Bluetooth driver usage. | 103 | - info on Marvell Bluetooth driver usage. |
| 104 | bus-devices/ | ||
| 105 | - directory with info on TI GPMC (General Purpose Memory Controller) | ||
| 85 | bus-virt-phys-mapping.txt | 106 | bus-virt-phys-mapping.txt |
| 86< | |||
