aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
AgeCommit message (Expand)AuthorFilesLines
2013-04-02Merge tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds29-58/+154
2013-04-02Merge tag 'v3.9-rc1_cns3xxx_fixes' of git://git.infradead.org/users/cbou/linu...Arnd Bergmann2-21/+11
2013-03-30ARM: cns3xxx: fix mapping of private memory regionMac Lin2-21/+11
2013-03-29Merge tag 'mvebu_fixes_for_v3.9_round2' of git://git.infradead.org/users/jcoo...Arnd Bergmann8-6/+24
2013-03-28arm: mvebu: Fix pinctrl for Armada 370 Mirabox SDIO port.Ryan Press2-1/+7
2013-03-28arm: orion5x: correct IRQ used in dtsi for mv_cesaAlexander Clouter1-1/+1
2013-03-28arm: orion5x: fix orion5x.dtsi gpio parametersAlexander Clouter1-1/+6
2013-03-28ARM: Kirkwood: fix unused mvsdio gpio pinsSebastian Hesselbarth3-0/+4
2013-03-28arm: mvebu: Use local interrupt only for the timer 0Gregory CLEMENT1-3/+5
2013-03-28ARM: kirkwood: Fix chip-delay for GoFlex NetEric Hutter1-0/+1
2013-03-28Merge tag 'ep93xx-fixes-for-3.9-rc5' of git://github.com/RyanMallon/linux-ep9...Arnd Bergmann1-3/+7
2013-03-28Merge tag 'imx-fixes-3.9-4' of git://git.linaro.org/people/shawnguo/linux-2.6...Arnd Bergmann4-0/+27
2013-03-27Merge tag 'ux500-fixes-for-v3.9' of git://git.kernel.org/pub/scm/linux/kernel...Arnd Bergmann5-5/+18
2013-03-27ARM: ux500: Enable the clock controlling Ethernet on SnowballLee Jones3-2/+16
2013-03-27ARM: ux500: Stop passing ios_handler() as an MMCI power controlling call-backLee Jones1-1/+0
2013-03-27ARM: ux500: Apply the TCPM and TCDM locations and sizes to dbx5x0 DTLee Jones1-2/+2
2013-03-27Merge tag 'omap-for-v3.9-rc3/fixes-signed' of git://git.kernel.org/pub/scm/li...Arnd Bergmann9-22/+64
2013-03-26ARM: OMAP: clocks: Delay clk inits atleast until slab is initializedRajendra Nayak3-6/+19
2013-03-26ARM: imx: fix sync issue between imx_cpu_die and imx_cpu_killShawn Guo3-0/+26
2013-03-25Merge tag 'msm-fix-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/davi...Arnd Bergmann1-1/+4
2013-03-25Merge tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds4-14/+15
2013-03-22ARM: tegra: fix register address of slink controllerLaxman Dewangan2-2/+2
2013-03-22ARM: msm: Stop counting before reprogramming clockeventStephen Boyd1-1/+4
2013-03-21Merge tag 'imx-fixes-3.9-3' of git://git.linaro.org/people/shawnguo/linux-2.6...Arnd Bergmann1-0/+1
2013-03-19Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds1-1/+1
2013-03-19Merge tag 'omap-fixes-a-for-3.9-rc' of git://git.kernel.org/pub/scm/linux/ker...Tony Lindgren6-16/+45
2013-03-19ARM: imx: add dependency check for DEBUG_IMX_UART_PORTShawn Guo1-0/+1
2013-03-19ARM: video: mxs: Fix mxsfb misconfiguring VDCTRL0Marek Vasut1-12/+12
2013-03-18Merge tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds15-42/+100
2013-03-18Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-armLinus Torvalds2-21/+14
2013-03-18ARM: fix CONFIG_VIRT_TO_BUS handlingArnd Bergmann2-5/+3
2013-03-18Merge tag 'renesas-fixes-for-v3.9' of git://git.kernel.org/pub/scm/linux/kern...Arnd Bergmann1-0/+1
2013-03-18ARM: ep93xx: Fix wait for UART FIFO to be emptyH Hartley Sweeten1-3/+7
2013-03-15Merge tag 'char-misc-3.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds4-0/+4
2013-03-15Merge branch 'fixes-for-3.9' of git://git.linaro.org/people/mszyprowski/linux...Linus Torvalds1-2/+3
2013-03-15Merge tag 'mfd-fixes-3.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds4-5/+4
2013-03-15ARM: 7674/1: smp: Avoid dummy clockevent being preferred over real hardware c...Santosh Shilimkar1-1/+1
2013-03-15Merge tag 'arm-imx-fixes-for-3.9-rc' of git://git.pengutronix.de/git/imx/linu...Arnd Bergmann2-0/+6
2013-03-15ARM: i.MX35: enable MAX clockSascha Hauer1-0/+1
2013-03-15ARM: Scorpion is a v7 architecture, not v6Stephen Boyd1-2/+2
2013-03-15Merge branch 'armsoc/fix' of git://github.com/hzhuang1/linux into fixesArnd Bergmann1-0/+1
2013-03-15ARM: mmp: add platform_device head file in gplugdHaojian Zhuang1-0/+1
2013-03-14Merge branch 'v3.9-samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/ker...Arnd Bergmann3-18/+33
2013-03-14Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixesArnd Bergmann25-125/+228
2013-03-14[media] s5p-fimc: fix s5pv210 buildArnd Bergmann1-1/+1
2013-03-14ARM: i.MX25: Fix DT compilationSascha Hauer1-0/+5
2013-03-14ARM: at91: fix infinite loop in at91_irq_suspend/resumeLudovic Desroches1-12/+8
2013-03-14ARM: at91: add gpio suspend/resume support when using pinctrlLudovic Desroches2-2/+16
2013-03-14ARM: DMA-mapping: add missing GFP_DMA flag for atomic buffer allocationMarek Szyprowski1-2/+3
2013-03-13ARM: OMAP4: PM: fix PM regression introduced by recent clock cleanupPaul Walmsley2-0/+11
2013-03-13ARM: OMAP3: hwmod data: keep MIDLEMODE in force-standby for musbGrazvydas Ignotas3-5/+18
2013-03-13ARM: OMAP4: clock data: lock USB DPLL on bootJon Hunter1-0/+15
2013-03-13ARM: OMAP1: fix USB host on 1710Aaro Koskinen1-11/+1
2013-03-13ARM: at91: dt: at91sam9x5: complete NAND pinctrlRichard Genoud1-2/+26
2013-03-13ARM: at91: dt: at91sam9x5: correct NAND pins commentsRichard Genoud1-2/+2
2013-03-12Merge tag 'stable/for-linus-3.9-rc2-tag' of git://git.kernel.org/pub/scm/linu...Linus Torvalds2-22/+6
2013-03-12ARM: w1-gpio: fix erroneous gpio requestsJohan Hovold4-0/+4
2013-03-12Select VIRT_TO_BUS directly where neededStephen Rothwell1-1/+1
2013-03-12Merge tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds50-90/+95
2013-03-12ARM:net: an issue for k which is u32, never < 0Chen Gang1-1/+1
2013-03-12Merge tag 'davinci-for-v3.9-rc/fixes' of git://git.kernel.org/pub/scm/linux/k...Arnd Bergmann1-0/+3
2013-03-12ARM: 7670/1: fix the memset fixNicolas Pitre1-20/+13
2013-03-12ARM: davinci: edma: fix dmaengine induced null pointer dereference on da830Matt Porter1-0/+3
2013-03-12ARM: spear3xx: Use correct pl080 header fileArnd Bergmann1-1/+1
2013-03-12mfd: ab8500: Kill "reg" property from bindingArnd Bergmann4-5/+4
2013-03-11Arm: socfpga: pl330: Add #dma-cells for generic dma binding supportPadmavathi Venna1-0/+3
2013-03-11Merge tag 'mvebu_fixes_for_v3.9' of git://git.infradead.org/users/jcooper/lin...Arnd Bergmann25-36/+44
2013-03-11Merge tag 'imx-fixes-3.9-2' of git://git.linaro.org/people/shawnguo/linux-2.6...Arnd Bergmann2-2/+2
2013-03-11Merge tag 'mxs-fixes-3.9-2' of git://git.linaro.org/people/shawnguo/linux-2.6...Arnd Bergmann1-5/+5
2013-03-11ARM: multiplatform: Sort the max gpio numbers.Maxime Ripard1-2/+5
2013-03-11xen: arm: mandate EABI and use generic atomic operations.Ian Campbell2-22/+6
2013-03-11ARM: imx: fix typo "DEBUG_IMX50_IMX53_UART"Paul Bolle1-1/+1
2013-03-11ARM: imx: pll1_sys should be an initial on clkShawn Guo1-1/+1
2013-03-08arm: mach-orion5x: fix typo in compatible string of a .dts fileThomas Petazzoni1-1/+1
2013-03-08arm: mvebu: fix address-cells in mpic DT nodeThomas Petazzoni1-1/+0
2013-03-08arm: plat-orion: fix address decoding when > 4GB is usedThomas Petazzoni1-2/+5
2013-03-08arm: mvebu: Reduce reg-io-width with UARTsHeikki Krogerus2-4/+4
2013-03-08ARM: Dove: add RTC device nodeJean-Francois Moine1-0/+5
2013-03-08arm: mvebu: enable the USB ports on Armada 370 Reference Design boardFlorian Fainelli1-0/+8
2013-03-08ARM: dove: drop "select COMMON_CLK_DOVE"Paul Bolle1-1/+0
2013-03-08rtc: rtc-mv: Add support for clk to avoid lockupsAndrew Lunn1-0/+1
2013-03-08gpio: mvebu: Add clk support to prevent lockupAndrew Lunn1-0/+2
2013-03-08ARM: kirkwood: fix to retain gbe MAC addresses for DT kernelsSebastian Hesselbarth1-7/+18
2013-03-08ARM: kirkwood: of_serial: fix clock gating by removing clock-frequencyJason Cooper17-20/+0
2013-03-08ARM: shmobile: marzen: Include mmc/host.hSimon Horman1-0/+1
2013-03-07ARM: 7668/1: fix memset-related crashes caused by recent GCC (4.7.2) optimiza...Ivan Djelic1-41/+44
2013-03-07ARM: mxs: cfa10049: Fix fb initialisation functionMaxime Ripard1-5/+5
2013-03-07ARM: EXYNOS: Add #dma-cells for generic dma binding support for PL330Padmavathi Venna2-0/+15
2013-03-06ARM: 7667/1: perf: Fix section mismatch on armpmu_init()Stephen Boyd1-1/+1
2013-03-06ARM: 7666/1: decompressor: add -mno-single-pic-base for building the decompre...Jonathan Austin1-1/+1
2013-03-05ARM: SPEAr13xx: Fix typo "ARCH_HAVE_CPUFREQ"Paul Bolle1-1/+1
2013-03-05Merge tag 'omap-for-v3.9-rc1/fixes-signed' of git://git.kernel.org/pub/scm/li...Arnd Bergmann8-14/+16
2013-03-05ARM: OMAP: RX-51: add missing USB phy bindingAaro Koskinen1-0/+2
2013-03-05ARM: S5PV210: Fix PL330 DMA controller clkdev entriesSylwester Nawrocki1-18/+18
2013-03-04Merge tag 'mxs-fixes-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6 i...Olof Johansson4-1/+4
2013-03-04Merge tag 'imx-fixes-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6 i...Olof Johansson3-26/+10
2013-03-04ARM: Tegra: Add clock entry for smp_twd clockPrashant Gaikwad2-0/+2
2013-03-04ARM: dts: remove generated .dtb files on cleanNishanth Menon1-1/+1
2013-03-04ARM: bcm2835: fix I2C module clock rateStephen Warren1-1/+1
2013-03-04ARM: OMAP2+: Remove duplicate omap4430_init_late() declarationSantosh Shilimkar1-1/+0
2013-03-04ARM: OMAP2+: mux: correct wrong error messagesRuslan Bilovol1-2/+2
2013-03-04ARM: OMAP2+: mux: fix debugfs file permissionFelipe Balbi1-2/+3
2013-03-04ARM: OMAP2+: Fix unmet direct dependencies for zoom for 8250 serialTony Lindgren2-6/+2
2013-03-04ARM: OMAP3: board-generic: Add missing omap3_init_lateRajendra Nayak1-0/+2
2013-03-04ARM: OMAP2+: Fix broken gpmc supportJon Hunter1-3/+3
2013-03-04ARM: OMAP1: Fix build related to kgdb.h no longer including serial_8250.hTony Lindgren1-0/+2
2013-03-04ARM: mxs: ocotp: Fix sparse warningFabio Estevam1-0/+1
2013-03-04ARM: mxs: icoll: Fix sparse warningFabio Estevam1-1/+1
2013-03-04ARM: mxs: mm: Fix sparse warningFabio Estevam1-0/+1
2013-03-04ARM: mxs_defconfig: Make USB host functional againFabio Estevam1-0/+1
2013-03-04ARM: dts: imx53-mba53: fix fsl,pins for disp1-grp1Shawn Guo1-2/+1
2013-03-04ARM: mach-imx: move early resume code out of the .data sectionNicolas Pitre2-24/+9
2013-03-03ARM: 7665/1: Wire up kcmp syscallCyrill Gorcunov2-2/+2
2013-03-03ARM: 7664/1: perf: remove erroneous semicolon from event initialisationChen Gang1-1/+1
2013-03-03ARM: 7663/1: perf: fix ARMv7 EVTYPE_MASK to include NSH bitWill Deacon1-1/+1
2013-03-03ARM: 7662/1: hw_breakpoint: reset debug logic on secondary CPUs in s2ram resumeDietmar Eggemann1-1/+1
2013-03-03ARM: 7661/1: mm: perform explicit branch predictor maintenance when requiredWill Deacon4-1/+6
2013-03-03ARM: 7660/1: tlb: add branch predictor maintenance operationsWill Deacon2-6/+40
2013-03-03ARM: 7659/1: mm: make mm->context.id an atomic64_t variableWill Deacon4-14/+19
2013-03-03ARM: 7658/1: mm: fix race updating mm->context.id on ASID rolloverWill Deacon1-3/+3
2013-03-03ARM: 7657/1: head: fix swapper and idmap population with LPAE and big-endianWill Deacon1-4/+22
2013-03-03ARM: 7655/1: smp_twd: make twd_local_timer_of_register() no-op for nosmpShawn Guo1-0/+4
2013-03-03ARM: 7652/1: mm: fix missing use of 'asid' to get asid value from mm->context.idBen Dooks1-1/+1
2013-03-03ARM: 7642/1: netx: bump IRQ offset to 64Linus Walleij2-33/+33
2013-03-03Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-armLinus Torvalds8-28/+35
2013-03-03Merge branches 'devel-stable', 'fixes' and 'mmci' into for-linusRussell King14-34/+64
2013-03-01ARM: Fix broken commit 0cc41e4a21d43 corrupting kernel messagesRussell King1-15/+21
2013-02-28Merge tag 'late-mvebu-rebased' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds42-329/+1195
2013-02-28Merge tag 'late-omap' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/ar...Linus Torvalds32-258/+575
2013-02-28Merge tag 'late-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds27-1883/+2516
2013-02-28arm: mvebu: enable the SD card slot on Armada 370 Reference Design boardFlorian Fainelli1-0/+7
2013-02-28ARM: kirkwood: topkick: init mvsdio via DTJason Cooper2-6/+7
2013-02-28ARM: kirkwood: nsa310: convert to pinctrlJason Cooper4-35/+99
2013-02-28ARM: Kirkwood: topkick: Enable i2c bus.Andrew Lunn1-1/+6
2013-02-28ARM: kirkwood: topkick: convert to pinctrlJason Cooper2-42/+90
2013-02-28ARM: dove: convert serial DT nodes to clocks propertySebastian Hesselbarth1-4/+4
2013-02-28arm: mvebu: Add SPI flash on Armada 370 DB boardGregory CLEMENT1-0/+12
2013-02-28arm: mvebu: Add SPI flash on Armada XP-DB boardGregory CLEMENT1-0/+12
2013-02-28arm: mvebu: Add SPI flash on Armada XP-GP boardEzequiel Garcia1-0/+12
2013-02-28arm: mvebu: Add support for SPI controller in Armada 370/XPEzequiel Garcia1-0/+21
2013-02-28arm: mvebu: update DT to support local timersGregory CLEMENT1-2/+3
2013-02-28ARM: Dove: convert usb host controller to DTSebastian Hesselbarth2-10/+16
2013-02-28arm: mvebu: Enable USB controllers on Armada 370/XP boardsEzequiel Garcia4-0/+34
2013-02-28arm: mvebu: Add support for USB host controllers in Armada 370/XPEzequiel Garcia3-0/+41
2013-02-28arm: mvebu: add button for OpenBlocks AX3-4Thomas Petazzoni1-0/+12
2013-02-28ARM: Kirkwood: Convert NS2 to gpio-poweroff.Andrew Lunn2-14/+6
2013-02-28ARM: Kirkwood: Convert NSA310 I2C to device treeAndrew Lunn2-6/+5
2013-02-28ARM: Kirkwood: Convert NSA310 to use gpio-poweroff driverAndrew Lunn2-33/+5
2013-02-28ARM: Kirkwood: Convert NSA310 to DT based regulators.Andrew Lunn2-4/+17
2013-02-28ARM: Dove: add fixed regulator for CuBox USB powerSebastian Hesselbarth2-1/+26
2013-02-28ARM: Dove: move CuBox led pinctrl to gpio-leds nodeSebastian Hesselbarth1-1/+4
2013-02-28ARM: Kirkwood: Convert openblocks A6 board to pinctrlNobuhiro Iwamatsu2-44/+116
2013-02-28ARM: Kirkwood: Add pinctrl of NAND to 88f6282Nobuhiro Iwamatsu1-0/+6
2013-02-28ARM: Kirkwood: Add pinctrl of TWSI1 to 88f6282Nobuhiro Iwamatsu1-0/+6
2013-02-28arm: kirkwood: add pinmux option for the SDIO interface on 88F6282Thomas Petazzoni1-0/+5
2013-02-28arm: kirkwood: mplcec4: use Device Tree to probe SDIOThomas Petazzoni2-9/+9
2013-02-28arm: kirkwood: dreamplug: use Device Tree to probe SDIOThomas Petazzoni2-6/+7
2013-02-28arm: kirkwood: add Device Tree informations for the SDIO controllerThomas Petazzoni1-0/+8
2013-02-28arm: mvebu: enable the SDIO interface on the Globalscale MiraboxThomas Petazzoni1-0/+10
2013-02-28arm: mvebu: enable the SD card slot on Armada 370 DB boardThomas Petazzoni1-0/+15
2013-02-28arm: mvebu: enable the SD card slot on Armada XP DB boardThomas Petazzoni1-0/+7
2013-02-28arm: mvebu: add pin muxing options for the SDIO interface on Armada XPThomas Petazzoni3-0/+18
2013-02-28arm: mvebu: add pin muxing options for the SDIO interface on Armada 370Thomas Petazzoni1-0/+12
2013-02-28arm: mvebu: add DT information for the SDIO interface of Armada 370/XPThomas Petazzoni1-0/+8
2013-02-28arm: mvebu: Add RTC support for Armada 370 and Armada XPGregory CLEMENT1-0/+6
2013-02-28arm: mvebu: update defconfig with ATAG support when using DTGregory CLEMENT1-0/+1
2013-02-28ARM: mvebu: Update defconfig to select SPI flash and MTD supportEzequiel Garcia1-0/+3
2013-02-28ARM: mvebu: Update defconfig to select SPI supportEzequiel Garcia1-0/+2
2013-02-28arm: mvebu: support for the new Armada XP development board(DB-MV784MP-GP)Gregory CLEMENT2-0/+102
2013-02-28arm: mvebu: update defconfig with local timer supportGregory CLEMENT1-1/+0
2013-02-28arm: mvebu: Add support for local interruptGregory CLEMENT1-4/+11
2013-02-28arm: mvebu: Update defconfig to select USB supportEzequiel Garcia1-1/+4
2013-02-28ARM: kirkwood: convert Guruplug Server Plus to use the device treeWilly Tarreau7-0/+151
2013-02-28arm: mvebu: add DTS file for Marvell RD-A370-A1 boardFlorian Fainelli2-0/+62
2013-02-28arm: mvebu: Improve the SMP support of the interrupt controllerGregory CLEMENT2-1/+73
2013-02-28ARM: Dove: split legacy and DT setupArnd Bergmann4-86/+110
2013-02-28ARM: dove: update dove_defconfig with a few useful optionsOlof Johansson1-20/+8
2013-02-28ARM: Kirkwood: Remove redundent SDIO clock aliasAndrew Lunn1-5/+0
2013-02-28ARM: Kirkwood: Remove redundent USB clock aliasAndrew Lunn1-4/+0
2013-02-28arm: mvebu: add LEDs support to defconfig fileThomas Petazzoni1-0/+5
2013-02-28arm: mvebu: enable btmrvl driver in mvebu_defconfigThomas Petazzoni1-0/+3
2013-02-28arm: mvebu: enable mwifiex driver in mvebu_defconfigThomas Petazzoni1-0/+3
2013-02-28arm: mvebu: enable SDIO support in mvebu_defconfigThomas Petazzoni1-0/+2
2013-02-28arm: mvebu: Update defconfig with Marvell RTC supportGregory CLEMENT1-0/+1
2013-02-28Merge branch 'timer/cleanup' into late/mvebu2Arnd Bergmann492-1394/+769
2013-02-27hlist: drop the node parameter from iteratorsSasha Levin1-3/+3
2013-02-27arch Kconfig: centralise CONFIG_ARCH_NO_VIRT_TO_BUSStephen Rothwell1-0/+1
2013-02-26Merge tag 'iommu-updates-v3.9' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds13-408/+240
2013-02-26Merge branch 'for-v3.9' of git://git.linaro.org/people/mszyprowski/linux-dma-...Linus Torvalds4-20/+117
2013-02-26Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linuxLinus Torvalds1-6/+0
2013-02-26Merge tag 'mmc-updates-for-3.9-rc1' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds1-0/+1
2013-02-26Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cool...Linus Torvalds2-11/+11
2013-02-26Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dmaLinus Torvalds5-150/+14
2013-02-25Merge git://git.kernel.org/pub/scm/virt/kvm/kvmLinus Torvalds3-8/+3
2013-02-25Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds1-1/+1
2013-02-25ARM: fix scheduling while atomic warning in alignment handling codeRussell King1-7/+4
2013-02-25ARM: VFP: fix emulation of second VFP instructionRussell King1-1/+1
2013-02-25ARM: DMA-mapping: fix memory leak in IOMMU dma-mapping implementationMarek Szyprowski1-3/+3
2013-02-25ARM: dma-mapping: Add maximum alignment order for dma iommu buffersSeung-Woo Kim2-0/+24
2013-02-25ARM: dma-mapping: use himem for DMA buffers for IOMMU-mapped devicesMarek Szyprowski1-2/+7