aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/Changes5
-rw-r--r--Documentation/DMA-attributes.txt2
-rw-r--r--Documentation/devicetree/bindings/arm/omap/omap.txt2
-rw-r--r--Documentation/devicetree/bindings/bus/mvebu-mbus.txt2
-rw-r--r--Documentation/devicetree/bindings/dma/dma.txt4
-rw-r--r--Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt2
-rw-r--r--Documentation/devicetree/bindings/gpio/gpio-mcp23s08.txt2
-rw-r--r--Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt2
-rw-r--r--Documentation/devicetree/bindings/mmc/samsung-sdhci.txt2
-rw-r--r--Documentation/devicetree/bindings/mtd/gpmc-nand.txt2
-rw-r--r--Documentation/devicetree/bindings/mtd/gpmc-nor.txt2
-rw-r--r--Documentation/devicetree/bindings/mtd/gpmc-onenand.txt2
-rw-r--r--Documentation/devicetree/bindings/pinctrl/brcm,bcm11351-pinctrl.txt12
-rw-r--r--Documentation/devicetree/bindings/powerpc/4xx/reboot.txt2
-rw-r--r--Documentation/devicetree/bindings/powerpc/fsl/dcsr.txt2
-rw-r--r--Documentation/devicetree/bindings/regulator/regulator.txt2
-rw-r--r--Documentation/devicetree/bindings/spi/spi-bus.txt2
-rw-r--r--Documentation/dma-buf-sharing.txt6
-rw-r--r--Documentation/dynamic-debug-howto.txt2
-rw-r--r--Documentation/edac.txt2
-rw-r--r--Documentation/fb/sm501.txt2
-rw-r--r--Documentation/fb/sstfb.txt2
-rw-r--r--Documentation/filesystems/proc.txt7
-rw-r--r--Documentation/filesystems/sharedsubtree.txt2
-rw-r--r--Documentation/gpio/consumer.txt2
-rw-r--r--Documentation/hid/uhid.txt2
-rw-r--r--Documentation/input/alps.txt2
-rw-r--r--Documentation/input/input.txt2
-rw-r--r--Documentation/mtd/nand/pxa3xx-nand.txt2
-rw-r--r--Documentation/networking/can.txt2
-rw-r--r--Documentation/networking/dccp.txt2
-rw-r--r--Documentation/powerpc/transactional_memory.txt2
-rw-r--r--Documentation/printk-formats.txt4
-rw-r--r--Documentation/rbtree.txt2
-rw-r--r--Documentation/rfkill.txt2
-rw-r--r--Documentation/robust-futexes.txt2
-rw-r--r--Documentation/s390/monreader.txt2
-rw-r--r--Documentation/security/Yama.txt2
-rw-r--r--Documentation/sound/alsa/ALSA-Configuration.txt4
-rw-r--r--Documentation/trace/events.txt2
-rw-r--r--Documentation/usb/mass-storage.txt2
-rw-r--r--Documentation/virtual/kvm/api.txt2
-rw-r--r--Documentation/vm/transhuge.txt4
-rw-r--r--Documentation/x86/earlyprintk.txt2
-rw-r--r--Documentation/x86/i386/IO-APIC.txt2
-rw-r--r--arch/arm64/include/asm/pgtable.h2
-rw-r--r--drivers/base/dma-buf.c2
-rw-r--r--drivers/gpu/drm/exynos/exynos_drm_ipp.c2
-rw-r--r--drivers/net/wireless/ath/ath10k/wmi.h4
-rw-r--r--drivers/net/wireless/ath/ath6kl/wmi.h2
-rw-r--r--drivers/of/base.c4
-rw-r--r--drivers/pci/pci.c6
-rw-r--r--drivers/scsi/aic7xxx/aic79xx.h2
-rw-r--r--drivers/scsi/aic7xxx/aic7xxx_osm.c10
-rw-r--r--drivers/staging/media/bcm2048/radio-bcm2048.c2
-rw-r--r--drivers/staging/media/go7007/go7007.txt1
-rw-r--r--include/linux/of_platform.h2
-rw-r--r--include/net/wimax.h4
-rw-r--r--lib/Kconfig.debug4
-rw-r--r--mm/dmapool.c4
-rw-r--r--scripts/mod/modpost.c2
61 files changed, 84 insertions, 89 deletions
diff --git a/Documentation/Changes b/Documentation/Changes
index 07c75d18154e..2254db0f00a5 100644
--- a/Documentation/Changes
+++ b/Documentation/Changes
@@ -73,6 +73,11 @@ Perl
73You will need perl 5 and the following modules: Getopt::Long, Getopt::Std, 73You will need perl 5 and the following modules: Getopt::Long, Getopt::Std,
74File::Basename, and File::Find to build the kernel. 74File::Basename, and File::Find to build the kernel.
75 75
76BC
77--
78
79You will need bc to build kernels 3.10 and higher
80
76 81
77System utilities 82System utilities
78================ 83================
diff --git a/Documentation/DMA-attributes.txt b/Documentation/DMA-attributes.txt
index cc2450d80310..18dc52c4f2a0 100644
--- a/Documentation/DMA-attributes.txt
+++ b/Documentation/DMA-attributes.txt
@@ -98,5 +98,5 @@ DMA_ATTR_FORCE_CONTIGUOUS
98By default DMA-mapping subsystem is allowed to assemble the buffer 98By default DMA-mapping subsystem is allowed to assemble the buffer
99allocated by dma_alloc_attrs() function from individual pages if it can 99allocated by dma_alloc_attrs() function from individual pages if it can
100be mapped as contiguous chunk into device dma address space. By 100be mapped as contiguous chunk into device dma address space. By
101specifing this attribute the allocated buffer is forced to be contiguous 101specifying this attribute the allocated buffer is forced to be contiguous
102also in physical memory. 102also in physical memory.
diff --git a/Documentation/devicetree/bindings/arm/omap/omap.txt b/Documentation/devicetree/bindings/arm/omap/omap.txt
index 189baba40cd6..d22b216f5d23 100644
--- a/Documentation/devicetree/bindings/arm/omap/omap.txt
+++ b/Documentation/devicetree/bindings/arm/omap/omap.txt
@@ -129,7 +129,7 @@ Boards:
129- AM437x GP EVM 129- AM437x GP EVM
130 compatible = "ti,am437x-gp-evm", "ti,am4372", "ti,am43" 130 compatible = "ti,am437x-gp-evm", "ti,am4372", "ti,am43"
131 131
132- DRA742 EVM: Software Developement Board for DRA742 132- DRA742 EVM: Software Development Board for DRA742
133 compatible = "ti,dra7-evm", "ti,dra742", "ti,dra74", "ti,dra7" 133 compatible = "ti,dra7-evm", "ti,dra742", "ti,dra74", "ti,dra7"
134 134
135- DRA722 EVM: Software Development Board for DRA722 135- DRA722 EVM: Software Development Board for DRA722
diff --git a/Documentation/devicetree/bindings/bus/mvebu-mbus.txt b/Documentation/devicetree/bindings/bus/mvebu-mbus.txt
index 7586fb68c072..5fa44f52a0b8 100644
--- a/Documentation/devicetree/bindings/bus/mvebu-mbus.txt
+++ b/Documentation/devicetree/bindings/bus/mvebu-mbus.txt
@@ -197,7 +197,7 @@ to be set by the operating system and that are guaranteed to be free of overlaps
197with one another or with the system memory ranges. 197with one another or with the system memory ranges.
198 198
199Each entry in the property refers to exactly one window. If the operating system 199Each entry in the property refers to exactly one window. If the operating system
200choses to use a different set of mbus windows, it must ensure that any address 200chooses to use a different set of mbus windows, it must ensure that any address
201translations performed from downstream devices are adapted accordingly. 201translations performed from downstream devices are adapted accordingly.
202 202
203The operating system may insert additional mbus windows that do not conflict 203The operating system may insert additional mbus windows that do not conflict
diff --git a/Documentation/devicetree/bindings/dma/dma.txt b/Documentation/devicetree/bindings/dma/dma.txt
index 8f504e6bae14..82104271e754 100644
--- a/Documentation/devicetree/bindings/dma/dma.txt
+++ b/Documentation/devicetree/bindings/dma/dma.txt
@@ -14,7 +14,7 @@ Required property:
14 14
15Optional properties: 15Optional properties:
16- dma-channels: Number of DMA channels supported by the controller. 16- dma-channels: Number of DMA channels supported by the controller.
17- dma-requests: Number of DMA requests signals supported by the 17- dma-requests: Number of DMA request signals supported by the
18 controller. 18 controller.
19 19
20Example: 20Example:
@@ -44,7 +44,7 @@ Required property:
44 #dma-cells property in the node referenced by phandle 44 #dma-cells property in the node referenced by phandle
45 containing DMA controller specific information. This 45 containing DMA controller specific information. This
46 typically contains a DMA request line number or a 46 typically contains a DMA request line number or a
47 channel number, but can contain any data that is used 47 channel number, but can contain any data that is
48 required for configuring a channel. 48 required for configuring a channel.
49- dma-names: Contains one identifier string for each DMA specifier in 49- dma-names: Contains one identifier string for each DMA specifier in
50 the dmas property. The specific strings that can be used 50 the dmas property. The specific strings that can be used
diff --git a/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt b/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt
index ee9be9961524..e577196a12c0 100644
--- a/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt
+++ b/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt
@@ -8,7 +8,7 @@ Required properties:
8 "fsl,imx51-sdma" 8 "fsl,imx51-sdma"
9 "fsl,imx53-sdma" 9 "fsl,imx53-sdma"
10 "fsl,imx6q-sdma" 10 "fsl,imx6q-sdma"
11 The -to variants should be preferred since they allow to determnine the 11 The -to variants should be preferred since they allow to determine the
12 correct ROM script addresses needed for the driver to work without additional 12 correct ROM script addresses needed for the driver to work without additional
13 firmware.