summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'omap-for-linus' of ↵Linus Torvalds2009-12-0816-720/+11306
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 * 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (149 commits) arm: omap: Add omap3_defconfig AM35xx: Defconfig for AM3517 EVM board AM35xx: Add support for AM3517 EVM board omap: 3630sdp: defconfig creation omap: 3630sdp: introduce 3630 sdp board support omap3: Add defconfig for IGEP v2 board omap3: Add minimal IGEP v2 support omap3: Add CompuLab CM-T35 defconfig omap3: Add CompuLab CM-T35 board support omap3: rx51: Add wl1251 wlan driver support omap3: rx51: Add SDRAM init omap1: Add default kernel configuration for Herald omap1: Add board support and LCD for HTC Herald omap: zoom2: update defconfig for LL_DEBUG_NONE omap: zoom3: defconfig creation omap3: zoom: Introduce zoom3 board support omap3: zoom: Drop i2c-1 speed to 2400 omap3: zoom: rename zoom2 name to generic zoom omap3: zoom: split board file for software reuse omap3evm: MIgrate to smsc911x ethernet driver ... Fix trivial conflict (two unrelated config options added next to each other) in arch/arm/mach-omap2/Makefile
| * arm: omap: Add omap3_defconfigOlof Johansson2009-12-031-0/+2119
| | | | | | | | | | | | | | | | | | | | Having one combined defconfig that is the superset of the individual defconfigs for OMAP3 platforms is useful for easily finding build errors. Not to mention convenient as a base if you want to boot several platforms with a single kernel image. Signed-off-by: Olof Johansson <olof@lixom.net> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * AM35xx: Defconfig for AM3517 EVM boardRanjith Lohithakshan2009-11-251-0/+1207
| | | | | | | | | | | | | | This patch adds a minimal defconfig for AM3517 EVM board. Signed-off-by: Ranjith Lohithakshan <ranjithl@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * omap: 3630sdp: defconfig creationvikram pandita2009-11-251-0/+1611
| | | | | | | | | | | | | | Create 3630sdp defconfig file Signed-off-by: Vikram Pandita <vikram.pandita@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * omap3: Add defconfig for IGEP v2 boardEnric Balletbo i Serra2009-11-251-0/+1554
| | | | | | | | | | | | | | Add defconfig for IGEP v2 board Signed-off-by: Enric Balletbo i Serra <eballetbo@iseebcn.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * omap3: Add CompuLab CM-T35 defconfigMike Rapoport2009-11-251-0/+1733
| | | | | | | | | | | | | | Add CompuLab CM-T35 defconfig Signed-off-by: Mike Rapoport <mike@compulab.co.il> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * omap1: Add default kernel configuration for HeraldCory Maccarrone2009-11-221-0/+1142
| | | | | | | | | | | | | | This adds a new defconfig for the HTC Herald series of devices. Signed-off-by: Cory Maccarrone <darkstar6262@gmail.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * omap: zoom2: update defconfig for LL_DEBUG_NONEvikram pandita2009-11-221-1/+2
| | | | | | | | | | | | | | Update DEBUG_LL for zoom2 board as CONFIG_OMAP_LL_DEBUG_NONE Signed-off-by: Vikram Pandita <vikram.pandita@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * omap: zoom3: defconfig creationvikram pandita2009-11-221-0/+1610
| | | | | | | | | | | | | | Create zoom3 defconfig file Signed-off-by: Vikram Pandita <vikram.pandita@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * omap3evm: MIgrate to smsc911x ethernet driverSriram2009-11-221-2/+2
| | | | | | | | | | | | | | | | | | | | Migrate to smsc911x ethernet driver instead of smc911x driver. The smsc911x ethernet driver supports NAPI and performs better under heavy traffic. With the smc911x driver we were witnessing very high iowait time for high IO load over NFS. Signed-off-by: Sriramakrishnan <srk@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * omap3evm: ehci: Update EHCI support on OMAP3EVM (Rev >= E)Ajay Kumar Gupta2009-11-221-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added runtime programming for the differences in EHCI interface between OMAP3EVM revisions (Rev >= E) and (Rev < E). Changes: - EHCI PHY reset GPIO pin is 21 on Rev >= E while Rev < E uses GPIO pin 135. - Rev >= E uses EHCI Vbus enable GPIO22 line. - Rev >= E uses GPIO61 to select EHCI port either on main board or on Mistral Daughter Card (MDC). OMAP3EVM Rev < E doesn't have EHCI port on main board. - Currently GPIO61 it programmed to enable EHCI port on main board only. Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
| * omap3: Update 3430SDP defconfigAnand Gadiyar2009-11-221-696/+298
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mainline merge of the 3430SDP support (commit 6fdc29e2) seems to have messed up the 3430 defconfig completely. Update the defconfig using a known good version (SDP defconfig from v2.6.26-omap2 and current beagle defconfig) as reference. The image size is now 1.9 MB down from 2.4 MB earlier, and the number of modules is 8, down from 203. Build time also scales proportionally. Other support (OneNAND, etc) can be enabled as needed. Note that this patch intentionally does not update CONFIG_FB related options to avoid merge conflicts with the pending omap_dss2 patches. Signed-off-by: Anand Gadiyar <gadiyar@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * omap3: defconfigs: remove SYSFS_DEPRECATED flagvikram pandita2009-11-228-16/+17
| | | | | | | | | | | | | | | | | | Remove the SYSFS_DEPRECATED flag from OMAP3 board defconfigs This is a deprecated feature no longer needed. Signed-off-by: Vikram Pandita <vikram.pandita@ti.com> Acked-by: Kevin Hilman <khilman@deeprootsystems.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * omap3: evm: make HSMMC driver built-inSriram2009-11-221-1/+1
| | | | | | | | | | | | | | | | | | For ease of use it is preferrable to build in HSMMC driver rather than build it as kernel module. This patches updates default configuration for omap3evm to reflect this change. Signed-off-by: Sriramakrishnan <srk@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM OMAP3: RX-51 board - add initialization of gpio keysJani Nikula2009-11-221-1/+1
| | | | | | | | | | | | | | | | | | Initialize some of the RX-51 input GPIO lines as gpio keys. Enable gpio keys as a module in rx51_defconfig. Signed-off-by: Jani Nikula <ext-jani.1.nikula@nokia.com> Acked-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Merge branch 'sa1100' into develRussell King2009-12-061-364/+612
|\ \
| * | ARM: 5825/1: SA1100: h3600: update defconfigDmitry Artamonow2009-12-061-364/+612
| |/ | | | | | | | | | | | | | | Update defconfig to current kernel, enable support for iPAQ H3100 and following drivers: gpio-keys, htc-egpio, ide_cs. Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | Merge branch 'devel-stable' into develRussell King2009-12-054-424/+2595
|\ \
| * \ Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into ↵Russell King2009-12-041-33/+68
| |\ \ | | | | | | | | | | | | devel-stable
| | * | Add KZM-ARM11-01 supportYoichi Yuasa2009-11-271-33/+68
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | Merge branch 'devel' of ↵Russell King2009-12-042-391/+907
| |\ \ \ | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
| | * | | [ARM] pxa/cm-x300: update defconfigIgor Grinberg2009-12-011-111/+240
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Signed-off-by: Mike Rapoport <mike@compulab.co.il> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| | * | | [ARM] pxa/ezx: update ezx_defconfig now that ezx-pcap is inAntonio Ospite2009-12-011-280/+667
| | | |/ | | |/| | | | | | | | | | | | | Signed-off-by: Antonio Ospite <ospite@studenti.unina.it> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * | | RTC: let Dove soc select the rtc-mv driver.Saeed Bishara2009-11-271-1/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Saeed Bishara <saeed@marvell.com> Signed-off-by: Nicolas Pitre <nico@marvell.com>
| * | | ARM: Add Tauros2 L2 cache controller supportLennert Buytenhek2009-11-271-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support for the Tauros2 L2 cache controller as used with the PJ1 and PJ4 CPUs. Signed-off-by: Lennert Buytenhek <buytenh@marvell.com> Signed-off-by: Saeed Bishara <saeed@marvell.com> Signed-off-by: Nicolas Pitre <nico@marvell.com>
| * | | ARM: add base support for Marvell Dove SoCSaeed Bishara2009-11-271-0/+1617
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Marvell Dove (88AP510) is a high-performance, highly integrated, low power SoC with high-end ARM-compatible processor (known as PJ4), graphics processing unit, high-definition video decoding acceleration hardware, and a broad range of peripherals. Signed-off-by: Lennert Buytenhek <buytenh@marvell.com> Signed-off-by: Saeed Bishara <saeed@marvell.com> Signed-off-by: Nicolas Pitre <nico@marvell.com>
| | |
| \ \
| \ \
| \ \
| \ \
| \ \
| \ \
| \ \
*-------. \ \ Merge branches 'at91', 'ep93xx', 'etm', 'ks8695', 'nuc', 'u300' and 'u8500' ↵Russell King2009-12-055-0/+2525
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | into devel
| | | | | * | ARM: 5835/1: ARM U8500: add defconfigSrinidhi Kasagar2009-12-011-0/+680
| |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add defconfig file for mop500 board Signed-off-by: srinidhi kasagar <srinidhi.kasagar@stericsson.com> Acked-by: Andrea Gallo <andrea.gallo@stericsson.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * | | ARM: 5844/1: rename w90p910_defconfig to n uc910_defconfigwanzongshun2009-12-021-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rename w90p910_defconfig Signed-off-by: Wan ZongShun <mcuos.com@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * | | ARM: 5839/1: add nuc960_defconfigwanzongshun2009-12-021-0/+922
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add nuc960_defconfig Signed-off-by: Wan ZongShun <mcuos.com@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * | | ARM: 5838/1: add nuc950_defconfigwanzongshun2009-12-021-0/+922
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | add nuc950_defconfig Signed-off-by: Wan ZongShun <mcuos.com@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | | ARM: 5782/1: at91: support for eco920Uwe Kleine-König2009-11-111-0/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CONFIG_MACH_ECO920 is enabled in at91rm9200dk_defconfig. The name is wrong, but this is better than adding another defconfig or don't get compile coverage at all. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Acked-by: Andrew Victor <linux@maxim.org.za> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | | Merge branch 'omap-fixes-for-linus' of ↵Linus Torvalds2009-11-123-13/+69
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 * 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: omap3: Decrease cpufreq transition latency omap3: update Pandora defconfig omap3: 3430sdp: Enable Linux Regulator framework omap3: beagle: Fix USB host port power control omap3: pandora: Fix keypad keymap omap1: Amstrad Delta defconfig fixes omap: Fix omapfb/lcdc on OMAP1510 broken when PM set omap: Use resource_size omap: Fix race condition in omap dma driver
| * | | | omap3: update Pandora defconfigGrazvydas Ignotas2009-11-111-5/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch updates defconfig to enable options needed to properly boot OMAP3 pandora board. It also enables MMC, OTG, GPIO LEDs, TWL4030 GPIO and sound drivers. Signed-off-by: Grazvydas Ignotas <notasas@gmail.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | | | omap3: 3430sdp: Enable Linux Regulator frameworkSergio Aguirre2009-11-111-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some drivers have dependencies on this, and therefore should be enabled. Signed-off-by: Sergio Aguirre <saaguirre@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | | | omap1: Amstrad Delta defconfig fixesJanusz Krzysztofik2009-11-111-7/+17
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch provides the following fixes: - keep kernel small enough to boot with standard tools, - ensure compatibility with both new and legacy distros, - turn on support for recently added or fixed hardware features. Created and tested against linux-2.6.32-rc5. Signed-off-by: Janusz Krzysztofik <jkrzysz@tis.icnet.pl> Signed-off-by: Tony Lindgren <tony@atomide.com>
* | | | [ARM] orion5x: update defconfigNicolas Pitre2009-11-081-102/+176
| | | | | | | | | | | | | | | | Signed-off-by: Nicolas Pitre <nico@marvell.com>
* | | | [ARM] Kirkwood: update defconfigNicolas Pitre2009-11-081-91/+169
|/ / / | | | | | | | | | Signed-off-by: Nicolas Pitre <nico@marvell.com>
* | | Merge branch 'omap-fixes-for-linus' of ↵Linus Torvalds2009-10-291-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 * 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: omap4: Fix UART4 platform data on omap4 omap4: Allow omap_serial_early_init() for OMAP4430 board omap3: PM: enable UART3 module wakeups omap2: Fix console serial port number for n8x0 omap2: Fix detection of n8x0 omap1: Fix DSP public peripherals support for ams-delta omap1: Fix redundant UARTs pin muxing that can break other hardware support omap: iommu: fix wrong condition check for SUPERSECTION omap: SDMA: Fix omap_stop_dma() API for channel linking omap: Fix omap-keypad by restoring old keypad.h without breaking omap2 boards that use matrix_keypad
| * | | omap2: Fix console serial port number for n8x0Tony Lindgren2009-10-231-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | With the recent changes omap serial ports match the physical numbering like they should. Fix the kernel CMDLINE accordingly so console works. Signed-off-by: Tony Lindgren <tony@atomide.com>
* / / ARM: 5765/1: Updated U300 defconfigLinus Walleij2009-10-211-28/+66
|/ / | | | | | | | | | | | | | | This updates the U300 to use all the drivers merged in during the 2.6.32 merge window. Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | omap: CONFIG_ISP1301_OMAP redefined in Beagle defconfigSanjeev Premi2009-10-141-1/+0
| | | | | | | | | | | | | | | | | | | | The symbol CONFIG_ISP1301_OMAP was defined twice in the defconfig. This was causing the warning: arch/arm/configs/omap3_beagle_defconfig:972:warning: override: reassigning to symbol ISP1301_OMAP Signed-off-by: Sanjeev Premi <premi@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* | Merge branch 'fixes' of ↵Russell King2009-10-021-125/+429
|\ \ | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/djbw/xscaleiop Conflicts: MAINTAINERS
| * | iop33x: update defconfig (default atu to on)Dan Williams2009-08-181-125/+429
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default the iop3xx configurations are set to boot the platforms over an nfs root configuration. Since commit c34002c1 "iop: unconditionally initialize the ATU on platforms known to be 'hosts'" this configuration also requires iop3xx_init_atu=y to be specified on the kernel command line. Signed-off-by: Dan Williams <dan.j.williams@intel.com>
* | | ARM: Remove unused CONFIG SA1100_H3XXXJaswinder Singh Rajput2009-09-281-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed unused CONFIG SA1100_H3XXX from Kconfig and defconfig Reported-by: Robert P. J. Day <rpjday@crashcourse.ca> Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com> Acked-by: Dmitry Artamonow <mad_soft@inbox.ru> Cc: Philipp Zabel <philipp.zabel@gmail.com> Cc: Kristoffer Ericson <kristoffer.ericson@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | Merge branch 'origin' into for-linusRussell King2009-09-2411-194/+4256
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: MAINTAINERS
| * \ \ Merge git://git.infradead.org/mtd-2.6Linus Torvalds2009-09-231-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.infradead.org/mtd-2.6: (58 commits) mtd: jedec_probe: add PSD4256G6V id mtd: OneNand support for Nomadik 8815 SoC (on NHK8815 board) mtd: nand: driver for Nomadik 8815 SoC (on NHK8815 board) m25p80: Add Spansion S25FL129P serial flashes jffs2: Use SLAB_HWCACHE_ALIGN for jffs2_raw_{dirent,inode} slabs mtd: sh_flctl: register sh_flctl using platform_driver_probe() mtd: nand: txx9ndfmc: transfer 512 byte at a time if possible mtd: nand: fix tmio_nand ecc correction mtd: nand: add __nand_correct_data helper function mtd: cfi_cmdset_0002: add 0xFF intolerance for M29W128G mtd: inftl: fix fold chain block number mtd: jedec: fix compilation problem with I28F640C3B definition mtd: nand: fix ECC Correction bug for SMC ordering for NDFC driver mtd: ofpart: Check availability of reg property instead of name property driver/Makefile: Initialize "mtd" and "spi" before "net" mtd: omap: adding DMA mode support in nand prefetch/post-write mtd: omap: add support for nand prefetch-read and post-write mtd: add nand support for w90p910 (v2) mtd: maps: add mtd-ram support to physmap_of mtd: pxa3xx_nand: add single-bit error corrections reporting ...
| | * | | mtd: nand: driver for Nomadik 8815 SoC (on NHK8815 board)Alessandro Rubini2009-09-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Alessandro Rubini <rubini@unipv.it> Acked-by: Andrea Gallo <andrea.gallo@stericsson.com> Acked-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * | | | N770: enable LCD MIPI-DCS in KconfigImre Deak2009-09-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Imre Deak <imre.deak@nokia.com> Acked-by: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| * | | | omapfb: add support for the ZOOM MDK LCDStanley.Miao2009-09-231-2/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add glue to control the OMAP_LDP LCD as a frame buffer device using the existing dispc.c driver under omapfb. Patch updated for mainline kernel. Note that the drivers/video/omap should be updated to pass omap_lcd_config in platform_data. The patch should also be updated to compile if twl4030 is not selected, and eventually to use the regulator framework. Fixed-by: Jarkko Nikula <jarkko.nikula@gmail.com> Fixed-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Stanley.Miao <stanley.miao@windriver.com> Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Imre Deak <imre.deak@nokia.com> Acked-by: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>