Loading Documentation/devicetree/bindings/pinctrl/atmel,at91-pinctrl.txt +3 −2 Original line number Diff line number Diff line Loading @@ -81,7 +81,8 @@ PA31 TXD4 Required properties for pin configuration node: - atmel,pins: 4 integers array, represents a group of pins mux and config setting. The format is atmel,pins = <PIN_BANK PIN_BANK_NUM PERIPH CONFIG>. The PERIPH 0 means gpio. The PERIPH 0 means gpio, PERIPH 1 is periph A, PERIPH 2 is periph B... PIN_BANK 0 is pioA, PIN_BANK 1 is pioB... Bits used for CONFIG: PULL_UP (1 << 0): indicate this pin need a pull up. Loading Loading @@ -126,7 +127,7 @@ pinctrl@fffff400 { pinctrl_dbgu: dbgu-0 { atmel,pins = <1 14 0x1 0x0 /* PB14 periph A */ 1 15 0x1 0x1>; /* PB15 periph with pullup */ 1 15 0x1 0x1>; /* PB15 periph A with pullup */ }; }; }; Loading Documentation/filesystems/f2fs.txt +9 −9 Original line number Diff line number Diff line Loading @@ -175,9 +175,9 @@ consists of multiple segments as described below. align with the zone size <-| |-> align with the segment size _________________________________________________________________________ | | | Node | Segment | Segment | | | Superblock | Checkpoint | Address | Info. | Summary | Main | | (SB) | (CP) | Table (NAT) | Table (SIT) | Area (SSA) | | | | | Segment | Node | Segment | | | Superblock | Checkpoint | Info. | Address | Summary | Main | | (SB) | (CP) | Table (SIT) | Table (NAT) | Area (SSA) | | |____________|_____2______|______N______|______N______|______N_____|__N___| . . . . Loading @@ -200,14 +200,14 @@ consists of multiple segments as described below. : It contains file system information, bitmaps for valid NAT/SIT sets, orphan inode lists, and summary entries of current active segments. - Node Address Table (NAT) : It is composed of a block address table for all the node blocks stored in Main area. - Segment Information Table (SIT) : It contains segment information such as valid block count and bitmap for the validity of all the blocks. - Node Address Table (NAT) : It is composed of a block address table for all the node blocks stored in Main area. - Segment Summary Area (SSA) : It contains summary entries which contains the owner information of all the data and node blocks stored in Main area. Loading Loading @@ -236,13 +236,13 @@ For file system consistency, each CP points to which NAT and SIT copies are valid, as shown as below. +--------+----------+---------+ | CP | NAT | SIT | | CP | SIT | NAT | +--------+----------+---------+ . . . . . . . . . . . . +-------+-------+--------+--------+--------+--------+ | CP #0 | CP #1 | NAT #0 | NAT #1 | SIT #0 | SIT #1 | | CP #0 | CP #1 | SIT #0 | SIT #1 | NAT #0 | NAT #1 | +-------+-------+--------+--------+--------+--------+ | ^ ^ | | | Loading MAINTAINERS +24 −18 Original line number Diff line number Diff line Loading @@ -228,7 +228,7 @@ S: Maintained F: drivers/platform/x86/acerhdf.c ACER WMI LAPTOP EXTRAS M: Joey Lee <jlee@novell.com> M: "Lee, Chun-Yi" <jlee@suse.com> L: platform-driver-x86@vger.kernel.org S: Maintained F: drivers/platform/x86/acer-wmi.c Loading Loading @@ -648,7 +648,7 @@ F: arch/arm/ ARM SUB-ARCHITECTURES L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: MAINTAINED S: Maintained F: arch/arm/mach-*/ F: arch/arm/plat-*/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git Loading Loading @@ -1351,6 +1351,14 @@ W: http://wireless.kernel.org/en/users/Drivers/ath9k S: Supported F: drivers/net/wireless/ath/ath9k/ WILOCITY WIL6210 WIRELESS DRIVER M: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com> L: linux-wireless@vger.kernel.org L: wil6210@qca.qualcomm.com S: Supported W: http://wireless.kernel.org/en/users/Drivers/wil6210 F: drivers/net/wireless/ath/wil6210/ CARL9170 LINUX COMMUNITY WIRELESS DRIVER M: Christian Lamparter <chunkeey@googlemail.com> L: linux-wireless@vger.kernel.org Loading Loading @@ -1964,9 +1972,9 @@ S: Maintained F: drivers/usb/host/ohci-ep93xx.c CIRRUS LOGIC CS4270 SOUND DRIVER M: Timur Tabi <timur@freescale.com> M: Timur Tabi <timur@tabi.org> L: alsa-devel@alsa-project.org (moderated for non-subscribers) S: Supported S: Odd Fixes F: sound/soc/codecs/cs4270* CLEANCACHE API Loading Loading @@ -3183,9 +3191,9 @@ F: include/uapi/video/ F: include/uapi/linux/fb.h FREESCALE DIU FRAMEBUFFER DRIVER M: Timur Tabi <timur@freescale.com> M: Timur Tabi <timur@tabi.org> L: linux-fbdev@vger.kernel.org S: Supported S: Maintained F: drivers/video/fsl-diu-fb.* FREESCALE DMA DRIVER Loading Loading @@ -3220,9 +3228,8 @@ F: drivers/net/ethernet/freescale/fs_enet/ F: include/linux/fs_enet_pd.h FREESCALE QUICC ENGINE LIBRARY M: Timur Tabi <timur@freescale.com> L: linuxppc-dev@lists.ozlabs.org S: Supported S: Orphan F: arch/powerpc/sysdev/qe_lib/ F: arch/powerpc/include/asm/*qe.h Loading @@ -3241,16 +3248,16 @@ S: Maintained F: drivers/net/ethernet/freescale/ucc_geth* FREESCALE QUICC ENGINE UCC UART DRIVER M: Timur Tabi <timur@freescale.com> M: Timur Tabi <timur@tabi.org> L: linuxppc-dev@lists.ozlabs.org S: Supported S: Maintained F: drivers/tty/serial/ucc_uart.c FREESCALE SOC SOUND DRIVERS M: Timur Tabi <timur@freescale.com> M: Timur Tabi <timur@tabi.org> L: alsa-devel@alsa-project.org (moderated for non-subscribers) L: linuxppc-dev@lists.ozlabs.org S: Supported S: Maintained F: sound/soc/fsl/fsl* F: sound/soc/fsl/mpc8610_hpcd.c Loading Loading @@ -5078,7 +5085,7 @@ S: Maintained F: drivers/media/radio/radio-mr800.c MSI LAPTOP SUPPORT M: "Lee, Chun-Yi" <jlee@novell.com> M: "Lee, Chun-Yi" <jlee@suse.com> L: platform-driver-x86@vger.kernel.org S: Maintained F: drivers/platform/x86/msi-laptop.c Loading Loading @@ -5508,8 +5515,7 @@ M: Benoît Cousson <b-cousson@ti.com> M: Paul Walmsley <paul@pwsan.com> L: linux-omap@vger.kernel.org S: Maintained F: arch/arm/mach-omap2/omap_hwmod.c F: arch/arm/plat-omap/include/plat/omap_hwmod.h F: arch/arm/mach-omap2/omap_hwmod.* OMAP HWMOD DATA FOR OMAP4-BASED DEVICES M: Benoît Cousson <b-cousson@ti.com> Loading Loading @@ -6580,7 +6586,7 @@ F: drivers/media/platform/s3c-camif/ F: include/media/s3c_camif.h SERIAL DRIVERS M: Alan Cox <alan@linux.intel.com> M: Greg Kroah-Hartman <gregkh@linuxfoundation.org> L: linux-serial@vger.kernel.org S: Maintained F: drivers/tty/serial Loading Loading @@ -7335,7 +7341,7 @@ S: Odd Fixes F: drivers/staging/speakup/ STAGING - TI DSP BRIDGE DRIVERS M: Omar Ramirez Luna <omar.ramirez@ti.com> M: Omar Ramirez Luna <omar.ramirez@copitl.com> S: Odd Fixes F: drivers/staging/tidspbridge/ Loading Loading @@ -8527,7 +8533,7 @@ F: Documentation/x86/ F: arch/x86/ X86 PLATFORM DRIVERS M: Matthew Garrett <mjg@redhat.com> M: Matthew Garrett <matthew.garrett@nebula.com> L: platform-driver-x86@vger.kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86.git S: Maintained Loading Makefile +2 −2 Original line number Diff line number Diff line VERSION = 3 PATCHLEVEL = 8 SUBLEVEL = 0 EXTRAVERSION = -rc3 EXTRAVERSION = -rc5 NAME = Terrified Chipmunk # *DOCUMENTATION* Loading Loading @@ -169,7 +169,7 @@ SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ -e s/arm.*/arm/ -e s/sa110/arm/ \ -e s/s390x/s390/ -e s/parisc64/parisc/ \ -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \ -e s/sh[234].*/sh/ ) -e s/sh[234].*/sh/ -e s/aarch64.*/arm64/ ) # Cross compiling and selecting different set of gcc/bin-utils # --------------------------------------------------------------------------- Loading arch/arm/boot/dts/Makefile +1 −0 Original line number Diff line number Diff line Loading @@ -155,6 +155,7 @@ dtb-$(CONFIG_ARCH_VT8500) += vt8500-bv07.dtb \ dtb-$(CONFIG_ARCH_ZYNQ) += zynq-zc702.dtb targets += dtbs targets += $(dtb-y) endif # *.dtb used to be generated in the directory above. Clean out the Loading Loading
Documentation/devicetree/bindings/pinctrl/atmel,at91-pinctrl.txt +3 −2 Original line number Diff line number Diff line Loading @@ -81,7 +81,8 @@ PA31 TXD4 Required properties for pin configuration node: - atmel,pins: 4 integers array, represents a group of pins mux and config setting. The format is atmel,pins = <PIN_BANK PIN_BANK_NUM PERIPH CONFIG>. The PERIPH 0 means gpio. The PERIPH 0 means gpio, PERIPH 1 is periph A, PERIPH 2 is periph B... PIN_BANK 0 is pioA, PIN_BANK 1 is pioB... Bits used for CONFIG: PULL_UP (1 << 0): indicate this pin need a pull up. Loading Loading @@ -126,7 +127,7 @@ pinctrl@fffff400 { pinctrl_dbgu: dbgu-0 { atmel,pins = <1 14 0x1 0x0 /* PB14 periph A */ 1 15 0x1 0x1>; /* PB15 periph with pullup */ 1 15 0x1 0x1>; /* PB15 periph A with pullup */ }; }; }; Loading
Documentation/filesystems/f2fs.txt +9 −9 Original line number Diff line number Diff line Loading @@ -175,9 +175,9 @@ consists of multiple segments as described below. align with the zone size <-| |-> align with the segment size _________________________________________________________________________ | | | Node | Segment | Segment | | | Superblock | Checkpoint | Address | Info. | Summary | Main | | (SB) | (CP) | Table (NAT) | Table (SIT) | Area (SSA) | | | | | Segment | Node | Segment | | | Superblock | Checkpoint | Info. | Address | Summary | Main | | (SB) | (CP) | Table (SIT) | Table (NAT) | Area (SSA) | | |____________|_____2______|______N______|______N______|______N_____|__N___| . . . . Loading @@ -200,14 +200,14 @@ consists of multiple segments as described below. : It contains file system information, bitmaps for valid NAT/SIT sets, orphan inode lists, and summary entries of current active segments. - Node Address Table (NAT) : It is composed of a block address table for all the node blocks stored in Main area. - Segment Information Table (SIT) : It contains segment information such as valid block count and bitmap for the validity of all the blocks. - Node Address Table (NAT) : It is composed of a block address table for all the node blocks stored in Main area. - Segment Summary Area (SSA) : It contains summary entries which contains the owner information of all the data and node blocks stored in Main area. Loading Loading @@ -236,13 +236,13 @@ For file system consistency, each CP points to which NAT and SIT copies are valid, as shown as below. +--------+----------+---------+ | CP | NAT | SIT | | CP | SIT | NAT | +--------+----------+---------+ . . . . . . . . . . . . +-------+-------+--------+--------+--------+--------+ | CP #0 | CP #1 | NAT #0 | NAT #1 | SIT #0 | SIT #1 | | CP #0 | CP #1 | SIT #0 | SIT #1 | NAT #0 | NAT #1 | +-------+-------+--------+--------+--------+--------+ | ^ ^ | | | Loading
MAINTAINERS +24 −18 Original line number Diff line number Diff line Loading @@ -228,7 +228,7 @@ S: Maintained F: drivers/platform/x86/acerhdf.c ACER WMI LAPTOP EXTRAS M: Joey Lee <jlee@novell.com> M: "Lee, Chun-Yi" <jlee@suse.com> L: platform-driver-x86@vger.kernel.org S: Maintained F: drivers/platform/x86/acer-wmi.c Loading Loading @@ -648,7 +648,7 @@ F: arch/arm/ ARM SUB-ARCHITECTURES L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: MAINTAINED S: Maintained F: arch/arm/mach-*/ F: arch/arm/plat-*/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git Loading Loading @@ -1351,6 +1351,14 @@ W: http://wireless.kernel.org/en/users/Drivers/ath9k S: Supported F: drivers/net/wireless/ath/ath9k/ WILOCITY WIL6210 WIRELESS DRIVER M: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com> L: linux-wireless@vger.kernel.org L: wil6210@qca.qualcomm.com S: Supported W: http://wireless.kernel.org/en/users/Drivers/wil6210 F: drivers/net/wireless/ath/wil6210/ CARL9170 LINUX COMMUNITY WIRELESS DRIVER M: Christian Lamparter <chunkeey@googlemail.com> L: linux-wireless@vger.kernel.org Loading Loading @@ -1964,9 +1972,9 @@ S: Maintained F: drivers/usb/host/ohci-ep93xx.c CIRRUS LOGIC CS4270 SOUND DRIVER M: Timur Tabi <timur@freescale.com> M: Timur Tabi <timur@tabi.org> L: alsa-devel@alsa-project.org (moderated for non-subscribers) S: Supported S: Odd Fixes F: sound/soc/codecs/cs4270* CLEANCACHE API Loading Loading @@ -3183,9 +3191,9 @@ F: include/uapi/video/ F: include/uapi/linux/fb.h FREESCALE DIU FRAMEBUFFER DRIVER M: Timur Tabi <timur@freescale.com> M: Timur Tabi <timur@tabi.org> L: linux-fbdev@vger.kernel.org S: Supported S: Maintained F: drivers/video/fsl-diu-fb.* FREESCALE DMA DRIVER Loading Loading @@ -3220,9 +3228,8 @@ F: drivers/net/ethernet/freescale/fs_enet/ F: include/linux/fs_enet_pd.h FREESCALE QUICC ENGINE LIBRARY M: Timur Tabi <timur@freescale.com> L: linuxppc-dev@lists.ozlabs.org S: Supported S: Orphan F: arch/powerpc/sysdev/qe_lib/ F: arch/powerpc/include/asm/*qe.h Loading @@ -3241,16 +3248,16 @@ S: Maintained F: drivers/net/ethernet/freescale/ucc_geth* FREESCALE QUICC ENGINE UCC UART DRIVER M: Timur Tabi <timur@freescale.com> M: Timur Tabi <timur@tabi.org> L: linuxppc-dev@lists.ozlabs.org S: Supported S: Maintained F: drivers/tty/serial/ucc_uart.c FREESCALE SOC SOUND DRIVERS M: Timur Tabi <timur@freescale.com> M: Timur Tabi <timur@tabi.org> L: alsa-devel@alsa-project.org (moderated for non-subscribers) L: linuxppc-dev@lists.ozlabs.org S: Supported S: Maintained F: sound/soc/fsl/fsl* F: sound/soc/fsl/mpc8610_hpcd.c Loading Loading @@ -5078,7 +5085,7 @@ S: Maintained F: drivers/media/radio/radio-mr800.c MSI LAPTOP SUPPORT M: "Lee, Chun-Yi" <jlee@novell.com> M: "Lee, Chun-Yi" <jlee@suse.com> L: platform-driver-x86@vger.kernel.org S: Maintained F: drivers/platform/x86/msi-laptop.c Loading Loading @@ -5508,8 +5515,7 @@ M: Benoît Cousson <b-cousson@ti.com> M: Paul Walmsley <paul@pwsan.com> L: linux-omap@vger.kernel.org S: Maintained F: arch/arm/mach-omap2/omap_hwmod.c F: arch/arm/plat-omap/include/plat/omap_hwmod.h F: arch/arm/mach-omap2/omap_hwmod.* OMAP HWMOD DATA FOR OMAP4-BASED DEVICES M: Benoît Cousson <b-cousson@ti.com> Loading Loading @@ -6580,7 +6586,7 @@ F: drivers/media/platform/s3c-camif/ F: include/media/s3c_camif.h SERIAL DRIVERS M: Alan Cox <alan@linux.intel.com> M: Greg Kroah-Hartman <gregkh@linuxfoundation.org> L: linux-serial@vger.kernel.org S: Maintained F: drivers/tty/serial Loading Loading @@ -7335,7 +7341,7 @@ S: Odd Fixes F: drivers/staging/speakup/ STAGING - TI DSP BRIDGE DRIVERS M: Omar Ramirez Luna <omar.ramirez@ti.com> M: Omar Ramirez Luna <omar.ramirez@copitl.com> S: Odd Fixes F: drivers/staging/tidspbridge/ Loading Loading @@ -8527,7 +8533,7 @@ F: Documentation/x86/ F: arch/x86/ X86 PLATFORM DRIVERS M: Matthew Garrett <mjg@redhat.com> M: Matthew Garrett <matthew.garrett@nebula.com> L: platform-driver-x86@vger.kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86.git S: Maintained Loading
Makefile +2 −2 Original line number Diff line number Diff line VERSION = 3 PATCHLEVEL = 8 SUBLEVEL = 0 EXTRAVERSION = -rc3 EXTRAVERSION = -rc5 NAME = Terrified Chipmunk # *DOCUMENTATION* Loading Loading @@ -169,7 +169,7 @@ SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ -e s/arm.*/arm/ -e s/sa110/arm/ \ -e s/s390x/s390/ -e s/parisc64/parisc/ \ -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \ -e s/sh[234].*/sh/ ) -e s/sh[234].*/sh/ -e s/aarch64.*/arm64/ ) # Cross compiling and selecting different set of gcc/bin-utils # --------------------------------------------------------------------------- Loading
arch/arm/boot/dts/Makefile +1 −0 Original line number Diff line number Diff line Loading @@ -155,6 +155,7 @@ dtb-$(CONFIG_ARCH_VT8500) += vt8500-bv07.dtb \ dtb-$(CONFIG_ARCH_ZYNQ) += zynq-zc702.dtb targets += dtbs targets += $(dtb-y) endif # *.dtb used to be generated in the directory above. Clean out the Loading
Olof Johansson <olof@lixom.net>Olof Johansson <olof@lixom.net>