summaryrefslogtreecommitdiffstats
path: root/arch
Commit message (Expand)AuthorAgeFilesLines
* x86/kprobes: Fix build errors and blacklist context_track_userMasami Hiramatsu2014-06-141-3/+4
* Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek...Linus Torvalds2014-06-122-4/+3
|\
| * powerpc: Avoid circular dependency with zImage.%Michal Marek2014-06-121-2/+2
| * um: Fix for relative objtree when generating x86 headersMichal Marek2014-06-051-2/+1
* | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/pow...Linus Torvalds2014-06-1265-4453/+427
|\ \
| * | powerpc/book3s: Fix some ABIv2 issues in machine check codeAnton Blanchard2014-06-121-2/+2
| * | powerpc/book3s: Fix guest MC delivery mechanism to avoid soft lockups in guest.Mahesh Salgaonkar2014-06-112-11/+23
| * | powerpc/book3s: Increment the mce counter during machine_check_early call.Mahesh Salgaonkar2014-06-111-0/+2
| * | powerpc/book3s: Add stack overflow check in machine check handler.Mahesh Salgaonkar2014-06-111-4/+20
| * | powerpc/book3s: Fix machine check handling for unhandled errorsMahesh Salgaonkar2014-06-111-3/+37
| * | powerpc/eeh: Dump PE location codeGavin Shan2014-06-114-11/+84
| * | powerpc/powernv: Enable POWER8 doorbell IPIsMichael Neuling2014-06-115-1/+18
| * | powerpc/powernv: Fix killed EEH eventGavin Shan2014-06-114-10/+19
| * | powerpc: fix typo 'CONFIG_PMAC'Paul Bolle2014-06-111-1/+1
| * | powerpc: fix typo 'CONFIG_PPC_CPU'Paul Bolle2014-06-111-1/+1
| * | powerpc/powernv: Don't escalate non-existing frozen PEGavin Shan2014-06-111-15/+9
| * | powerpc/eeh: Report frozen parent PE prior to child PEGavin Shan2014-06-112-5/+52
| * | powerpc/eeh: Clear frozen state for child PEGavin Shan2014-06-111-4/+16
| * | powerpc/powernv: Reduce panic timeout from 180s to 10sAnton Blanchard2014-06-111-0/+2
| * | powerpc/xmon: avoid format string leaking to printkKees Cook2014-06-111-1/+1
| * | powerpc/perf: Ensure all EBB register state is cleared on fork()Michael Ellerman2014-06-111-0/+2
| * | powerpc/powernv: Fix reading of OPAL msglogJoel Stanley2014-06-111-1/+5
| * | powerpc/spufs: Remove duplicate SPUFS_CNTL_MAP_SIZE defineDan Carpenter2014-06-111-1/+0
| * | powerpc/cpm: Remove duplicate FCC_GFMR_TTX defineDan Carpenter2014-06-111-1/+0
| * | powerpc/powernv: Fix endianness problems in EEHGuo Chao2014-06-113-99/+120
| * | powernv: Fix permissions on sysparam sysfs entriesAnton Blanchard2014-06-111-2/+2
| * | powerpc/powernv : Disable subcore for UP configsShreyas B. Prabhu2014-06-111-2/+2
| * | powerpc/powernv: Include asm/smp.h to fix UP build failureShreyas B. Prabhu2014-06-111-0/+1
| * | powerpc: Don't setup CPUs with bad statusMichael Neuling2014-06-111-1/+1
| * | powerpc: Correct DSCR during TM context switchSam bobroff2014-06-113-12/+8
| * | powerpc: Remove platforms/wsp and associated piecesMichael Ellerman2014-06-1132-4250/+1
| * | powerpc: Remove check for CONFIG_SERIAL_TEXT_DEBUGPaul Bolle2014-06-111-19/+0
| * | powerpc: Add AT_HWCAP2 to indicate V.CRYPTO category supportBenjamin Herrenschmidt2014-06-112-1/+3
* | | Merge tag 'blackfin-for-linus' of http://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2014-06-129-9/+10
|\ \ \
| * | | blackfin: defconfigs: add MTD_SPI_NOR (new dependency for M25P80)Brian Norris2014-06-127-9/+7
| * | | Revert "blackfin: dma: current count mmr is read only"Steven Miao2014-06-111-0/+2
| * | | bf533: fix build error: add linux/gpio.hSteven Miao2014-06-101-0/+1
* | | | Merge branch 'x86-irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2014-06-124-24/+46
|\ \ \ \
| * | | | x86/irq: Fix fixup_irqs() error handlingPrarit Bhargava2014-04-162-14/+27
| * | | | Merge branch 'x86/apic' into x86/irq, to consolidate branches.Ingo Molnar2014-04-161-2/+2
| |\ \ \ \
| * | | | | x86, irq, pic: Probe for legacy PIC and set legacy_pic appropriatelyK. Y. Srinivasan2014-04-142-10/+19
| | |_|_|/ | |/| | |
* | | | | Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2014-06-122-28/+28
|\ \ \ \ \
| * \ \ \ \ Merge commit '3cf2f34' into sched/core, to fix build errorIngo Molnar2014-06-1270-297/+110
| |\ \ \ \ \
| * | | | | | sched: Rename capacity related flagsNicolas Pitre2014-06-051-1/+1
| * | | | | | sched: Final power vs. capacity cleanupsNicolas Pitre2014-06-051-27/+27
* | | | | | | Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2014-06-1228-470/+566
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'perf/urgent' into perf/core, to resolve conflict and to prepare...Ingo Molnar2014-06-06179-848/+1046
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'uprobes/core' of git://git.kernel.org/pub/scm/linux/kernel/git/...Ingo Molnar2014-06-052-20/+19
| |\ \ \ \ \ \ \ \
| | * | | | | | | | uprobes/x86: Rename arch_uprobe->def to ->defparam, minor comment updatesOleg Nesterov2014-06-052-20/+19
| * | | | | | | | | perf/x86: Add conditional branch filtering supportAnshuman Khandual2014-06-051-0/+5