aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-02-21 20:40:58 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2013-02-21 20:40:58 -0500
commit9afa3195b96da7d2320ec44d19fbfbded7a15571 (patch)
tree15c4222de2a2b2814c9430dcb4e997b18597881c
parent7c2db36e730ee4facd341679ecb21ee73ba92831 (diff)
parentdf63447f1a4402d7d9c6a9cd1c39a6d6766452d1 (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 ...
-rw-r--r--Documentation/00-INDEX149
-rw-r--r--Documentation/ABI/testing/sysfs-devices-system-cpu14
-rw-r--r--Documentation/DocBook/kernel-hacking.tmpl4
-rw-r--r--Documentation/x86/x86_64/boot-options.txt4
-rw-r--r--arch/h8300/README2
-rw-r--r--arch/mips/cavium-octeon/executive/cvmx-helper-util.c4
-rw-r--r--arch/mips/include/asm/octeon/cvmx-helper-util.h4
-rw-r--r--arch/powerpc/platforms/85xx/p1022_ds.c8
-rw-r--r--arch/powerpc/platforms/86xx/mpc8610_hpcd.c4
-rw-r--r--arch/x86/kernel/cpu/perf_event_amd_ibs.c2
-rw-r--r--arch/xtensa/Kconfig2
-rw-r--r--drivers/bluetooth/ath3k.c2
-rw-r--r--drivers/devfreq/exynos4_bus.c2
-rw-r--r--drivers/firewire/ohci.c2
-rw-r--r--drivers/gpu/drm/i915/i915_debugfs.c2
-rw-r--r--drivers/hid/Kconfig2
-rw-r--r--drivers/ide/Kconfig5
-rw-r--r--drivers/infiniband/hw/cxgb3/iwch_provider.c2
-rw-r--r--drivers/isdn/hardware/eicon/divacapi.h6
-rw-r--r--drivers/isdn/hardware/eicon/pc.h4
-rw-r--r--drivers/isdn/mISDN/l1oip_core.c2
-rw-r--r--drivers/media/platform/soc_camera/mx2_camera.c2
-rw-r--r--drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c2
-rw-r--r--drivers/net/ethernet/marvell/mvneta.c1
-rw-r--r--drivers/net/ethernet/mellanox/mlx4/en_main.c2
-rw-r--r--drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c2
-rw-r--r--drivers/net/irda/ali-ircc.c2
-rw-r--r--drivers/of/address.c2
-rw-r--r--drivers/of/platform.c1
-rw-r--r--drivers/pcmcia/rsrc_nonstatic.c6
-rw-r--r--drivers/rpmsg/virtio_rpmsg_bus.c2
-rw-r--r--drivers/scsi/Kconfig2
-rw-r--r--drivers/staging/android/binder.h2
-rw-r--r--drivers/staging/octeon/ethernet.c2
-rw-r--r--drivers/target/sbp/sbp_target.c2
-rw-r--r--drivers/tty/ipwireless/hardware.c4
-rw-r--r--fs/btrfs/extent-tree.c6
-rw-r--r--fs/btrfs/relocation.c4
-rw-r--r--fs/btrfs/transaction.c1
-rw-r--r--fs/cifs/link.c2
-rw-r--r--fs/hpfs/inode.c2
-rw-r--r--fs/jfs/super.c2
-rw-r--r--fs/ocfs2/cluster/tcp.c2
-rw-r--r--fs/qnx6/inode.c2
-rw-r--r--include/linux/dma-buf.h2
-rw-r--r--include/linux/percpu_counter.h2
-rw-r--r--include/net/irda/irlmp.h2
-rw-r--r--include/net/irda/irttp.h2
-rw-r--r--net/bluetooth/hci_core.c2
-rw-r--r--net/caif/cfcnfg.c2
-rw-r--r--net/irda/timer.c2
-rw-r--r--net/sctp/sm_make_chunk.c2
-rw-r--r--scripts/basic/fixdep.c2
-rw-r--r--sound/soc/codecs/ab8500-codec.c2
-rw-r--r--sound/soc/codecs/wm8974.c6
-rw-r--r--sound/soc/codecs/wm8978.c6
-rw-r--r--sound/soc/codecs/wm8983.c6
-rw-r--r--sound/soc/codecs/wm8985.c6
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 @@
2This is a brief list of all the files in ./linux/Documentation and what 2This is a brief list of all the files in ./linux/Documentation and what
3they contain. If you add a documentation file, please list it here in 3they contain. If you add a documentation file, please list it here in
4alphabetical order as well, or risk being hunted down like a rabid dog. 4alphabetical order as well, or risk being hunted down like a rabid dog.
5Please try and keep the descriptions small enough to fit on one line. 5Please keep the descriptions small enough to fit on one line.
6 Thanks -- Paul G. 6 Thanks -- Paul G.
7 7
8Following translations are available on the WWW: 8Following translations are available on the WWW:
@@ -20,24 +20,33 @@ BUG-HUNTING
20Changes 20Changes
21 - list of changes that break older software packages. 21 - list of changes that break older software packages.
22CodingStyle 22CodingStyle
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.
24development-process/
25 - An extended tutorial on how to work with the kernel development
26 process.
27DMA-API.txt 24DMA-API.txt
28 - DMA API, pci_ API & extensions for non-consistent memory machines. 25 - DMA API, pci_ API & extensions for non-consistent memory machines.
26DMA-API-HOWTO.txt
27 - Dynamic DMA mapping Guide
29DMA-ISA-LPC.txt 28DMA-ISA-LPC.txt
30 - How to do DMA with ISA (and LPC) devices. 29 - How to do DMA with ISA (and LPC) devices.
30DMA-attributes.txt
31 - listing of the various possible attributes a DMA region can have
31DocBook/ 32DocBook/
32 - directory with DocBook templates etc. for kernel documentation. 33 - directory with DocBook templates etc. for kernel documentation.
34EDID/
35 - directory with info on customizing EDID for broken gfx/displays.
33HOWTO 36HOWTO
34 - the process and procedures of how to do Linux kernel development. 37 - the process and procedures of how to do Linux kernel development.
35IPMI.txt 38IPMI.txt
36 - info on Linux Intelligent Platform Management Interface (IPMI) Driver. 39 - info on Linux Intelligent Platform Management Interface (IPMI) Driver.
37IRQ-affinity.txt 40IRQ-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.
42IRQ-domain.txt
43 - info on inerrupt numbering and setting up IRQ domains.
39IRQ.txt 44IRQ.txt
40 - description of what an IRQ is. 45 - description of what an IRQ is.
46Intel-IOMMU.txt
47 - basic info on the Intel IOMMU virtualization support.
48Makefile
49 - some files in Documentation dir are actually sample code to build
41ManagementStyle 50ManagementStyle
42 - how to (attempt to) manage kernel hackers. 51 - how to (attempt to) manage kernel hackers.
43RCU/ 52RCU/
@@ -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.
67arm/ 76arm/
68 - directory with info about Linux on the ARM architecture. 77 - directory with info about Linux on the ARM architecture.
78arm64/
79 - directory with info about Linux on the 64 bit ARM architecture.
69atomic_ops.txt 80atomic_ops.txt
70 - semantics and behavior of atomic and bitmask operations. 81 - semantics and behavior of atomic and bitmask operations.
71auxdisplay/ 82auxdisplay/
72 - misc. LCD driver documentation (cfag12864b, ks0108). 83 - misc. LCD driver documentation (cfag12864b, ks0108).
84backlight/
85 - directory with info on controlling backlights in flat panel displays
86bad_memory.txt
87 - how to use kernel parameters to exclude bad RAM regions.
73basic_profiling.txt 88basic_profiling.txt
74 - basic instructions for those who wants to profile Linux kernel. 89 - basic instructions for those who wants to profile Linux kernel.
75binfmt_misc.txt 90binfmt_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.
81blockdev/ 96blockdev/
82 - info on block devices & drivers 97 - info on block devices & drivers
98braille-console.txt
99 - info on how to use serial devices for Braille support.
100bt8xxgpio.txt
101 - info on how to modify a bt8xx video card for GPIO usage.
83btmrvl.txt 102btmrvl.txt
84 - info on Marvell Bluetooth driver usage. 103 - info on Marvell Bluetooth driver usage.
104bus-devices/
105 - directory with info on TI GPMC (General Purpose Memory Controller)
85bus-virt-phys-mapping.txt 106bus-virt-phys-mapping.txt
86<