aboutsummaryrefslogtreecommitdiffstats
path: root/arch
AgeCommit message (Expand)AuthorFilesLines
2013-05-26Merge branch 'parisc-for-3.10' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds9-57/+57
2013-05-25score: remove redundant kcore_list entriesKyle McMartin1-2/+0
2013-05-25Merge tag 'arc-v3.10-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds11-70/+41
2013-05-25Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-armLinus Torvalds3-3/+2
2013-05-25ARC: lazy dcache flush broke gdb in non-aliasing configsVineet Gupta2-19/+11
2013-05-24Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds46-207/+176
2013-05-24Merge tag 'sunxi-fixes-for-3.10' of git://github.com/mripard/linux into fixesOlof Johansson3-3/+6
2013-05-24parisc: fix irq stack on UP and SMPHelge Deller3-41/+26
2013-05-24parisc: make interrupt and interruption stack allocation reentrantJohn David Anglin2-10/+10
2013-05-24parisc: show number of FPE and unaligned access handler calls in /proc/interr...Helge Deller4-0/+14
2013-05-24parisc: use PAGE_SHIFT instead of hardcoded value 12 in pacache.SHelge Deller1-6/+6
2013-05-24parisc: add rp5470 entry to machine databaseHelge Deller1-0/+1
2013-05-24Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixesOlof Johansson4-10/+5
2013-05-24Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po...Linus Torvalds12-57/+127
2013-05-24ARM: at91/sama5: fix incorrect PMC pcr div definitionJosh Wu1-3/+3
2013-05-24ARM: at91/dt: fix macb pinctrl_macb_rmii_mii_alt definitionBoris BREZILLON1-1/+1
2013-05-24ARM: at91: at91sam9n12: move external irq declatation to DTJean-Christophe PLAGNIOL-VILLARD2-6/+1
2013-05-24powerpc/pseries: Make 32-bit MSI quirk work on systems lacking firmware supportBrian King1-3/+37
2013-05-24powerpc/powernv: Build a zImage.epaprBenjamin Herrenschmidt1-0/+1
2013-05-24powerpc: Make radeon 32-bit MSI quirk work on powernvBenjamin Herrenschmidt6-48/+38
2013-05-24powerpc: Context switch more PMU related SPRsMichael Ellerman3-0/+40
2013-05-24powerpc/powernv: Fix condition for when to invalidate the TCE cacheBenjamin Herrenschmidt1-1/+1
2013-05-24powerpc/pci: Fix bogus message at boot about empty memory resourcesBenjamin Herrenschmidt1-3/+4
2013-05-24powerpc: Fix TLB cleanup at boot on POWER8Benjamin Herrenschmidt1-2/+6
2013-05-23Merge tag 'pci-v3.10-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds1-6/+4
2013-05-23Merge tag 'usb-3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gre...Linus Torvalds6-6/+0
2013-05-23Merge git://git.kernel.org/pub/scm/virt/kvm/kvmLinus Torvalds2-9/+26
2013-05-23ARC: Use enough bits for determining page's cache colorVineet Gupta1-1/+1
2013-05-23ARC: Brown paper bag bug in macro for checking cache colorVineet Gupta2-2/+5
2013-05-23ARC: copy_(to|from)_user() to honor usermode-access permissionsVineet Gupta3-15/+19
2013-05-23ARC: [mm] Prevent stray dcache lines after__sync_icache_dcach()Vineet Gupta1-1/+1
2013-05-22Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egt...Linus Torvalds7-35/+8
2013-05-22Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linusLinus Torvalds28-237/+306
2013-05-22ARM: 7729/1: vfp: ensure VFP_arch is non-zero when VFP is not supportedWill Deacon1-1/+1
2013-05-22ARM: 7727/1: remove the .vm_mm value from gate_vmaSteven Capper1-1/+0
2013-05-22ARM: 7723/1: crypto: sha1-armv4-large.S: fix SP handlingArd Biesheuvel1-1/+1
2013-05-22Merge tag 'renesas-boards-marzen-fixes-for-v3.10' of git://git.kernel.org/pub...Olof Johansson1-3/+3
2013-05-22Merge tag 'omap-fixes-a-for-3.10-rc' of git://git.kernel.org/pub/scm/linux/ke...Olof Johansson7-120/+48
2013-05-22avr32: fix building warnings caused by redefinitions of HZJiang Liu4-27/+2
2013-05-22MIPS: N64: Wire getdents64(2)Aron Xu2-2/+4
2013-05-22kprobes/mips: Fix to check double free of insn slotMasami Hiramatsu1-1/+4
2013-05-22KVM/MIPS32: Wrap calls to gfn_to_pfn() with srcu_read_lock/unlock()Sanjay Lal1-9/+26
2013-05-22KVM/MIPS32: Move include/asm/kvm.h => include/uapi/asm/kvm.h since it is a us...Sanjay Lal1-0/+0
2013-05-22ARM: shmobile: marzen: Use error values in usb_power_*Simon Horman1-3/+3
2013-05-22MIPS: Idle: Break r4k_wait into two functions and fix it.Ralf Baechle3-4/+11
2013-05-22MIPS: Idle: Do address fiddlery in helper functions.Ralf Baechle3-6/+15
2013-05-22MIPS: Idle: Consolidate all declarations in <asm/idle.h>.Ralf Baechle19-5/+28
2013-05-22MIPS: Idle: Don't call local_irq_disable() in cpu_wait() implementations.Ralf Baechle1-3/+0
2013-05-22MIPS: Idle: Re-enable irqs at the end of r3081, au1k and loongson2 cpu_wait.Ralf Baechle1-0/+2
2013-05-22MIPS: Idle: Make call of function pointer readable.Ralf Baechle1-1/+1
2013-05-22MIPS: Idle: Consistently reformat inline assembler.Ralf Baechle1-18/+21
2013-05-22MIPS: Idle: cleaup SMTC idle hook as per Linux coding style.Ralf Baechle1-2/+7
2013-05-22MIPS: Consolidate idle loop / WAIT instruction support in a single file.Ralf Baechle4-212/+233
2013-05-22MIPS: clock.h: Remove declaration of cpu_wait.Ralf Baechle1-2/+0
2013-05-21Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s39...Linus Torvalds10-30/+27
2013-05-21ARM: smp: Drop RCU_NONIDLE usage in cpu_die()Stephen Boyd1-1/+1
2013-05-20ARM: tegra: defconfig fixesAlexandre Courbot1-1/+2
2013-05-20ARM: nomadik: fix IRQ assignment for SMC ethernetLinus Walleij1-3/+9
2013-05-20Merge tag 'ux500-arm-soc-v3.10-fixes' of git://git.kernel.org/pub/scm/linux/k...Olof Johansson5-11/+10
2013-05-20Merge tag 'imx-fixes-3.10' of git://git.linaro.org/people/shawnguo/linux-2.6 ...Olof Johansson3-5/+32
2013-05-20Merge tag 'fixes-3.10-2' of git://git.infradead.org/users/jcooper/linux into ...Olof Johansson8-29/+15
2013-05-20Merge tag 'omap-for-v3.10-rc1/fixes' of git://git.kernel.org/pub/scm/linux/ke...Olof Johansson5-5/+27
2013-05-20ARM: vt8500: Add missing NULL terminator in dt_compatSrinivas Kandagatla1-0/+1
2013-05-20Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixesOlof Johansson4-14/+11
2013-05-20Merge tag 'fixes-3.10-1' of git://git.infradead.org/users/jcooper/linux into ...Olof Johansson5-3/+7
2013-05-20x86: Fix bit corruption at CPU resume timeLinus Torvalds1-1/+1
2013-05-20ARM: dts: mvebu: Fix wrong the address reg value for the L2-cache nodeGregory CLEMENT1-1/+1
2013-05-20ARM: plat-orion: Fix num_resources and id for ge10 and ge11Gregory CLEMENT1-6/+6
2013-05-20Revert "x86/pci/mrst: Use configuration mechanism 1 for 00:00.0, 00:02.0, 00:...Bjorn Helgaas1-6/+4
2013-05-19ARM: OMAP2+: hwmod: Remove sysc slave idle and auto idle apisSantosh Shilimkar2-71/+0
2013-05-19ARM: OMAP2+: serial: Remove the un-used slave idle hooksSantosh Shilimkar1-31/+0
2013-05-19ARM: OMAP2+: hwmod-data: UART IP needs software control to manage sidle modesSantosh Shilimkar4-1/+18
2013-05-19ARM: OMAP2+: hwmod: Add a new flag to handle SIDLE in SWSUP only in activeRajendra Nayak2-1/+6
2013-05-19ARM: OMAP2+: hwmod: Fix sidle programming in _enable_sysc()/_idle_sysc()Rajendra Nayak1-17/+25
2013-05-19arm: mvebu: fix the 'ranges' property to handle PCIeThomas Petazzoni2-2/+4
2013-05-19ARM: mvebu: select ARCH_REQUIRE_GPIOLIB for mvebu platformGregory CLEMENT1-0/+1
2013-05-19MIPS: Rewrite pfn_valid to work in modules, too.Ralf Baechle1-8/+7
2013-05-18Merge branch 'devm_no_resource_check' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds3-14/+0
2013-05-18Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linusLinus Torvalds21-199/+149
2013-05-18Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cmar...Linus Torvalds7-19/+9
2013-05-18arch/mips/lantiq/xway: don't check resource with devm_ioremap_resourceWolfram Sang1-4/+0
2013-05-18arch/arm/plat-samsung: don't check resource with devm_ioremap_resourceWolfram Sang1-5/+0
2013-05-18arch/arm/mach-tegra: don't check resource with devm_ioremap_resourceWolfram Sang1-5/+0
2013-05-17MIPS: ralink: use the dwc2 driver for the rt305x USB controllerMatthijs Kooijman2-0/+14
2013-05-17MIPS: Extract schedule_mfi info from __scheduleTony Wu1-2/+32
2013-05-17MIPS: Fix sibling call handling in get_frame_infoTony Wu1-2/+4
2013-05-17MIPS: MSP71xx: remove inline marking of EXPORT_SYMBOL functionsDenis Efremov1-1/+1
2013-05-17MIPS: Make virt_to_phys() work for all unmapped addresses.David Daney2-2/+2
2013-05-17MIPS: Fix build error for crash_dump.c in 3.10-rc1EunBong Song1-0/+1
2013-05-17MIPS: Xway: Fix clk leakLibo Chen1-0/+2
2013-05-17arm64: debug: fix mdscr.ss check when enabling debug exceptionsWill Deacon1-1/+1
2013-05-17ARM: AM33XX: Add missing .clkdm_name to clkdiv32k_ick clockVaibhav Hiremath1-3/+23
2013-05-17ARM: mvebu: Fix ranges entry on XP GP boardEzequiel Garcia1-0/+3
2013-05-17s390/pgtable: fix ipte notify bitChristian Borntraeger1-2/+2
2013-05-17s390/smp: fix cpu re-scan vs. cpu stateMartin Schwidefsky1-1/+1
2013-05-16Revert "MIPS: Allow ASID size to be determined at boot time."David Daney13-162/+93
2013-05-16Revert "MIPS: microMIPS: Support dynamic ASID sizing."David Daney1-32/+2
2013-05-16ARM: OMAP2+: Add missing CONFIG_ARCH_MULTI_V6=y to omap2plus_defconfigPaul Walmsley1-0/+1
2013-05-16ARM: OMAP: fix error return code in omap1_system_dma_init()Wei Yongjun1-0/+1
2013-05-16ARM: OMAP: fix __init section mismatch for _enable_preprogramjean-philippe francois1-1/+1
2013-05-16ARM: dts: Fix musb interrupt for device tree bootingTony Lindgren1-1/+1
2013-05-15Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds3-6/+23
2013-05-15Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/...Linus Torvalds1-1/+0
2013-05-15Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds1-0/+3
2013-05-15Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-armLinus Torvalds4-9/+7
2013-05-15USB: remove remaining instances of USB_SUSPENDAlan Stern6-6/+0
2013-05-15ARM: ux500: select REGULATOREmilio López1-0/+1
2013-05-15s390/ftrace: fix mcount adjustmentHeiko Carstens4-12/+13
2013-05-15s390: fix gmap_ipte_notifier vs. software dirty pagesChristian Borntraeger1-2/+1
2013-05-15ARM: at91: rm9200 fix time supportJean-Christophe PLAGNIOL-VILLARD1-2/+5
2013-05-15ARM: sunxi: select ARCH_REQUIRE_GPIOLIBMaxime Ripard1-0/+1
2013-05-15ARC: [TB10x] Remove redundant abilis,simple-pinctrl mechanismChristian Ruppert4-32/+4
2013-05-14time: Revert ALWAYS_USE_PERSISTENT_CLOCK compile time optimizaitonsJohn Stultz1-1/+0
2013-05-14arm64: Do not source kernel/time/Kconfig explicitlyCatalin Marinas1-2/+0
2013-05-14arm64: mm: Fix operands of clz in __flush_dcache_allSukanto Ghosh1-1/+1
2013-05-14arm64: Invoke the of_platform_populate() at arch_initcall() levelCatalin Marinas1-9/+3
2013-05-14Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po...Linus Torvalds45-206/+763
2013-05-14ARM: at91: dts: request only spi cs-gpios used on sama5d3x cpu moduleLudovic Desroches2-10/+4
2013-05-14ARM: at91/trivial: typo in GEM compatible stringNicolas Ferre1-1/+1
2013-05-14ARM: at91/trivial: fix model name for SAM9X25-EKJean-Christophe PLAGNIOL-VILLARD1-1/+1
2013-05-14ARM: ux500: Provide device enumeration number suffix for SMSC911xLee Jones1-1/+1
2013-05-14ARM: ux500: Fix incorrect DEBUG UART virtual addressesLee Jones1-3/+3
2013-05-14ARM: ux500: Remove duplicated assignment of ab8500_platdataLee Jones3-7/+5
2013-05-14powerpc: Set show_unhandled_signals to 1 by defaultBenjamin Herrenschmidt1-1/+1
2013-05-14powerpc/perf: Fix setting of "to" addresses for BHRBMichael Neuling1-1/+30
2013-05-14powerpc/pmu: Fix order of interpreting BHRB target entriesMichael Neuling1-43/+46
2013-05-14powerpc/perf: Move BHRB code into CONFIG_PPC64 regionMichael Neuling1-121/+127
2013-05-14powerpc: select HAVE_CONTEXT_TRACKING for pSeriesLi Zhong1-0/+1
2013-05-14powerpc: Use the new schedule_user API on userspace preemptionLi Zhong2-1/+12
2013-05-14powerpc: Exit user context on notify resumeLi Zhong1-0/+5
2013-05-14powerpc: Exception hooks for context tracking subsystemLi Zhong3-45/+112
2013-05-14powerpc: Syscall hooks for context tracking subsystemLi Zhong2-2/+10
2013-05-14powerpc/booke64: Fix kernel hangs at kernel_dbg_excScott Wood2-4/+11
2013-05-14powerpc: Fix irq_set_affinity() return valuesAlexander Gordeev4-4/+4
2013-05-14powerpc: Provide __bswapdi2David Woodhouse3-1/+24
2013-05-14powerpc/powernv: Fix starting of secondary CPUs on OPALv2 and v3Benjamin Herrenschmidt1-6/+56
2013-05-14powerpc/powernv: Detect OPAL v3 API versionBenjamin Herrenschmidt4-4/+13
2013-05-14powerpc: Fix MAX_STACK_TRACE_ENTRIES too low warning againLi Zhong3-4/+1
2013-05-14powerpc: Make CONFIG_RTAS_PROC depend on CONFIG_PROC_FSMichael Ellerman1-1/+1
2013-05-14powerpc: Bring all threads online prior to migration/hibernationRobert Jennings3-0/+137
2013-05-14powerpc/rtas_flash: Fix validate_flash buffer overflow issueVasant Hegde1-4/+6
2013-05-14powerpc/kexec: Fix kexec when using VMX optimised memcpyAnton Blanchard1-0/+4
2013-05-14powerpc: Fix build errors STRICT_MM_TYPECHECKSAneesh Kumar K.V3-5/+5
2013-05-14powerpc/mm: Use the correct mask value when looking at pgtable addressAneesh Kumar K.V1-1/+1
2013-05-13Merge tag 'fixes-for-3.10-rc2-tag' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds1-19/+14
2013-05-13Merge branch 'parisc-for-3.10' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds7-101/+194
2013-05-13ARM: 7720/1: ARM v6/v7 cmpxchg64 shouldn't clear upper 32 bits of the old/new...Jaccon Bastiaansen1-4/+4
2013-05-13avr32: fix relocation check for signed 18-bit offsetHans-Christian Egtvedt1-1/+1
2013-05-13avr32: move NODES_SHIFT into Kconfig and delete numnodes.hHans-Christian Egtvedt2-7/+5
2013-05-13parisc: make default cross compiler search more robust (v3)Helge Deller1-12/+9
2013-05-13ARM: Orion: Remove redundant init_dma_coherent_pool_size()Andrew Lunn3-20/+0
2013-05-13ARM: mvebu: Add a ranges entry to translate devbus childsEzequiel Garcia1-0/+3
2013-05-13xen/arm: rename xen_secondary_init and run it on every online cpuStefano Stabellini1-11/+4
2013-05-13xen/arm: do not handle VCPUOP_register_vcpu_info failuresStefano Stabellini1-7/+3
2013-05-13xen/arm: initialize pm functions laterStefano Stabellini1-1/+7
2013-05-13ARM: plat-orion: add missing ehci include to common.hSebastian Hesselbarth1-0/+1
2013-05-13Kirkwood: Enable PCIe port 1 on QNAP TS-11x/TS-21xMartin Michlmayr1-1/+1
2013-05-13ARM: mvebu: do not duplicate the mpic aliasThomas Petazzoni2-2/+2
2013-05-13arm64: debug: clear mdscr_el1 instead of taking the OS lockWill Deacon2-4/+1
2013-05-13arm64: Fix duplicate definition of early_consoleChen Gang1-2/+3
2013-05-13ARM: sunxi: Fix Mini X-plus device tree buildMaxime Ripard2-3/+5
2013-05-12ARM: imx: fix typo in gpu3d_shader_selsShawn Guo1-1/+1
2013-05-12ARM: imx: replicate the diagnostic register of boot cpu into secondary coresShawn Guo2-0/+26
2013-05-12ARM i.MX6: correct MLB clock configurationDirk Behme1-1/+1
2013-05-12ARM i.MX6q: Fix periph_clk2_sel and periph2_clk2_sel clocksPhilipp Zabel1-3/+4
2013-05-11Merge tag 'stable/for-linus-3.10-rc0-tag-two' of git://git.kernel.org/pub/scm...Linus Torvalds3-5/+52
2013-05-11Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/...Linus Torvalds1-0/+3
2013-05-11Merge git://git.infradead.org/users/eparis/auditLinus Torvalds1-1/+1
2013-05-11parisc: fix SMP races when updating PTE and TLB entries in entry.SJohn David Anglin1-72/+83
2013-05-11parisc: implement irq stacks - part 2 (v2)Helge Deller5-17/+102
2013-05-10Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds16-105/+23
2013-05-10Merge tag 'for-linus-20130509' of git://git.infradead.org/~dwmw2/random-2.6Linus Torvalds1-17/+0
2013-05-10Merge tag 'kvm-3.10-2' of git://git.kernel.org/pub/scm/virt/kvm/kvmLinus Torvalds3-21/+67
2013-05-10Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linusLinus Torvalds200-2305/+16132
2013-05-10Merge tag 'arc-v3.10-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds13-74/+377
2013-05-10Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg...Linus Torvalds14-47/+56
2013-05-10Merge tag 'for-linus' of git://github.com/realmz/blackfin-linuxLinus Torvalds14-24/+101
2013-05-10Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblazeLinus Torvalds9-29/+46
2013-05-10ARM: 7715/1: MCPM: adapt to GIC changes after upstream mergeNicolas Pitre1-3/+0
2013-05-10xen/pci: Used cached MSI-X capability offsetBjorn Helgaas1-2/+1
2013-05-10xen/pci: Use PCI_MSIX_TABLE_BIR, not PCI_MSIX_FLAGS_BIRMASKBjorn Helgaas1-1/+1
2013-05-10x86/mm: Add missing comments for initial kernel direct mappingZhang Yanfei1-1/+18
2013-05-10powerpc: hard_irq_disable(): Call trace_hardirqs_off after disablingScott Wood1-2/+3
2013-05-10powerpc/powernv: Improve kexec reliabilityBenjamin Herrenschmidt7-0/+56
2013-05-10ARC: [TB10x] Remove GENERIC_GPIOVineet Gupta1-7/+0
2013-05-09Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds40-147/+126
2013-05-09Merge tag 'xtensa-next-20130508' of git://github.com/czankel/xtensa-linuxLinus Torvalds32-254/+773
2013-05-09Merge tag 'arc-v3.10-rc1-part1' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds38-342/+1840
2013-05-09Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetca...Linus Torvalds5-12/+45
2013-05-09Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds1-2/+2
2013-05-09ARM: exynos: dts: Fixed vbus-gpiosDoug Anderson2-2/+2
2013-05-09ARM: EXYNOS5: Fix kernel dump in AFTR idle modeInderpal Singh2-3/+3
2013-05-09Merge tag 'omap-for-v3.10/dt-fixes-for-merge-window' of git://git.kernel.org/...Olof Johansson9-9/+35
2013-05-09Merge tag 'omap-for-v3.10/fixes-for-merge-window-part2' of git://git.kernel.o...Olof Johansson9-42/+39
2013-05-09ARM: ux500: Rid ignored return value of regulator_enable() compiler warningLee Jones1-2/+2
2013-05-09ARM: ux500: read the correct soc_id numberFabio Baltieri1-1/+1
2013-05-09ARM: exynos: dts: cros5250: add cyapa trackpadOlof Johansson1-0/+8
2013-05-09ARM: imx: Select GENERIC_ALLOCATORFabio Estevam3-78/+1
2013-05-09ARM: imx: compile fix for hotplug.cShawn Guo2-0/+3
2013-05-09Merge branch 'late/fixes' into fixesOlof Johansson11-10/+32