summaryrefslogtreecommitdiffstats
path: root/arch
Commit message (Expand)AuthorAgeFilesLines
* ARM: versatile: ensure sched_clock() is notraceRabin Vincent2010-11-191-0/+1
* Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2010-11-121-1/+3
|\
| * Staging: Merge 'tidspbridge-2.6.37-rc1' into staging-linusGreg Kroah-Hartman2010-11-111-1/+3
| |\
| | * omap: dsp: remove shm from normal memoryFelipe Contreras2010-11-101-1/+3
* | | Merge branch 'upstream/core' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2010-11-122-8/+12
|\ \ \
| * | | xen: do not release any memory under 1M in domain 0Ian Campbell2010-11-101-7/+11
| * | | xen: correct size of level2_kernel_pgtIan Campbell2010-10-291-1/+1
* | | | Merge branch 'stable/xen-pcifront-fixes' of git://git.kernel.org/pub/scm/linu...Linus Torvalds2010-11-121-3/+5
|\ \ \ \
| * | | | xen: fix memory leak in Xen PCI MSI/MSI-X allocator.Jiri Slaby2010-11-081-3/+5
| | |_|/ | |/| |
* | | | Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2010-11-1227-71/+168
|\ \ \ \
| * | | | ARM: GIC: don't disable software generated interruptsRussell King2010-11-121-4/+24
| * | | | ARM: 6472/1: vexpress ct-ca9x4: only set twd_base if local timers are being usedWill Deacon2010-11-101-0/+2
| * | | | ARM: arch/arm/kernel/traps.c: Convert sprintf_symbol to %pSJoe Perches2010-11-071-4/+1
| * | | | ARM: arch/arm/kernel/hw_breakpoint.c: Convert WARN_ON to WARNJoe Perches2010-11-071-2/+1
| * | | | ARM: 6462/1: EP93xx: Document DMA M2P APIRyan Mallon2010-11-071-9/+102
| * | | | ARM: 6470/1: atomic64: use generic implementation for OABI configurationsWill Deacon2010-11-071-1/+1
| * | | | ARM: 6469/1: perf-events: squash compiler warningWill Deacon2010-11-071-1/+1
| * | | | ARM: 6468/1: backtrace: fix calculation of thread stack baseWill Deacon2010-11-072-2/+2
| * | | | Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/px...Russell King2010-11-074-5/+4
| |\ \ \ \
| | * | | | ARM: pxa/saar: fix the building failure caused by typoEric Miao2010-11-031-1/+1
| | * | | | ARM: pxa/cm-x2xx: remove duplicate call to pxa27x_init_irqMike Rapoport2010-11-031-2/+0
| | * | | | ARM: pxa: fix the missing definition of IRQ_BOARD_ENDEric Miao2010-11-031-1/+1
| | * | | | ARM: mmp: fix cpuid detection on mmp2Haojian Zhuang2010-11-031-1/+2
| | |/ / /
| * | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orionRussell King2010-11-0713-42/+29
| |\ \ \ \
| | * | | | ARM: orion5x/kirkwood/mv78xx0: fix MPP configuration corner casesMike Rapoport2010-11-053-9/+3
| | * | | | [ARM] TS-78xxx NAND resource type should be IORESOURCE_MEMMichael Spang2010-11-051-1/+1
| | * | | | [ARM] Kirkwood: restrict the scope of the PCIe reset workaroundNicolas Pitre2010-10-213-6/+16
| | * | | | [ARM] Kirkwood: fix timer initialization for LaCie boardsSimon Guinot2010-10-215-22/+6
| | * | | | [ARM] Kirkwood: enhance TCLK detectionSimon Guinot2010-10-211-4/+3
| * | | | | ARM: Fix DMA coherent allocator alignmentRussell King2010-11-071-1/+1
* | | | | | Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2010-11-129-155/+119
|\ \ \ \ \ \
| * | | | | | x86, pvclock: Remove leftover scale_delta() functionKusanagi Kouichi2010-11-101-38/+0
| * | | | | | x86, apic: Remove double #includeJesper Juhl2010-11-101-1/+0
| * | | | | | x86: Adjust section annotations in AMD Fam10 MMCONF enabling codeJan Beulich2010-11-101-3/+4
| * | | | | | x86, UV: Update node controller MMRsJack Steiner2010-11-102-99/+102
| * | | | | | x86: Remove unnecessary casts of void ptr returning alloc function return valuesJesper Juhl2010-11-102-8/+7
| * | | | | | x86: Address gcc4.6 "set but not used" warnings in apic.hAndi Kleen2010-11-091-5/+5
| * | | | | | x86, mm: Fix section mismatch in tlb.cRakib Mullick2010-11-011-1/+1
* | | | | | | Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2010-11-121-2/+2
|\ \ \ \ \ \ \
| * | | | | | | perf, amd: Use kmalloc_node(,__GFP_ZERO) for northbridge structure allocationPeter Zijlstra2010-11-101-2/+2
| | |_|_|_|_|/ | |/| | | | |
* / | | | | | um: fix ptrace build errorRichard Weinberger2010-11-122-3/+3
|/ / / / / /
* | | | | | Merge branch 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/...Linus Torvalds2010-11-085-3/+153
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'rmobile/core' into rmobile-fixes-for-linusPaul Mundt2010-11-085-3/+153
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | ARM: mach-shmobile: Allow GPIO chips to register IRQ mappings.Paul Mundt2010-11-041-2/+2
| | * | | | | ARM: mach-shmobile: fix sh7372 after a recent clock framework reworkGuennadi Liakhovetski2010-11-021-0/+1
| | * | | | | ARM: mach-shmobile: include drivers/sh/KconfigPaul Mundt2010-11-011-0/+2
| | * | | | | ARM: mach-shmobile: ap4evb: Add HDMI sound supportKuninori Morimoto2010-10-311-1/+45
| | * | | | | ARM: mach-shmobile: clock-sh7372: Add FSIDIV clock supportKuninori Morimoto2010-10-312-0/+103
| | |/ / / /
| | | | | |
| \ \ \ \ \
| \ \ \ \ \
| \ \ \ \ \
| \ \ \ \ \
| \ \ \ \ \
| \ \ \ \ \
| \ \ \ \ \
*-------. \ \ \ \ \ Merge branches 'sh/pio-death', 'sh/nommu', 'sh/clkfwk', 'sh/core' and 'sh/int...Paul Mundt2010-11-0844-1477/+158
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | / / | | | | | | |_|/ / | | | | | |/| | |
| | | | * / | | | sh: Simplify phys_addr_mask()/PTE_PHYS_MASK for 29/32-bit.Paul Mundt2010-11-041-12/+0
| | | | |/ / / /