summaryrefslogtreecommitdiffstats
path: root/arch
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'upstream/bugfix' of git://github.com/jsgf/linux-xenLinus Torvalds2011-09-121-2/+3
|\
| * xen: use non-tracing preempt in xen_clocksource_read()Jeremy Fitzhardinge2011-08-241-2/+3
* | Merge branch 'fixes' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-09-1218-18/+72
|\ \
| * \ Merge branch 'for_3.1/pm-fixes-2' of git://gitorious.org/khilman/linux-omap-p...Arnd Bergmann2011-09-121-0/+3
| |\ \
| | * | OMAP: omap_device: fix !CONFIG_SUSPEND case in _noirq handlersKevin Hilman2011-09-061-0/+3
| * | | Merge branch 'sirf/fixes' into fixesArnd Bergmann2011-09-124-0/+4
| |\ \ \
| | * | | ARM: CSR: add missing sentinels to of_device_id tablesJamie Iles2011-09-114-0/+4
| | | | |
| | \ \ \
| *-. \ \ \ Merge branches 'cns3xxx/fixes', 'omap/fixes' and 'davinci/fixes' into fixesArnd Bergmann2011-09-109-14/+64
| |\ \ \ \ \
| | | * | | | ARM: davinci: fix cache flush build errorLinus Walleij2011-09-071-1/+5
| | | * | | | ARM: davinci: correct MDSTAT_STATE_MASKSergei Shtylyov2011-09-071-1/+1
| | | * | | | ARM: davinci: da850 EVM: read mac address from SPI flashRajashekhara, Sudhakar2011-09-071-0/+28
| | | |/ / /
| | | | | |
| | | \ \ \
| | | \ \ \
| | | \ \ \
| | | \ \ \
| | | \ \ \
| | *-----. \ \ \ Merge branches 'non_hwmod_compliant_fix_3.1rc', 'omap3_clock_fixes_3.1rc', 'o...Paul Walmsley2011-09-0465-332/+582
| | |\ \ \ \ \ \ \
| | | | | | * | | | OMAP: clockdomain: Wait for powerdomain to be ON when using clockdomain force...Santosh Shilimkar2011-08-192-2/+2
| | | | | | * | | | OMAP: powerdomains: Make all powerdomain target states as ON at initRajendra Nayak2011-08-191-9/+16
| | | | | * | | | | OMAP2430: hwmod: musb: add missing terminator to omap2430_usbhsotg_addrs[]Paul Walmsley2011-09-041-0/+1
| | | | | | |_|/ / | | | | | |/| | |
| | | | * | | | | OMAP4: clock: fix compile warningPaul Walmsley2011-08-211-0/+2
| | | | | |/ / / | | | | |/| | |
| | | * | | | | OMAP3: clock: indicate that gpt12_fck and wdt1_fck are in the WKUP clockdomainPaul Walmsley2011-08-221-0/+2
| | | | |_|_|/ | | | |/| | |
| | * | | | | OMAP4: clock: re-enable previous clockdomain enable/disable sequencePaul Walmsley2011-08-191-1/+7
| | | |/ / / | | |/| | |
| * | | | | ARM: cns3xxx: Fix newly introduced warnings in the PCIe codeAnton Vorontsov2011-09-091-1/+1
| * | | | | ARM: cns3xxx: Fix compile error caused by hardware.h removedTommy Lin2011-09-093-3/+0
| | |_|_|/ | |/| | |
* | | | | Merge branch 'for-linus' of git://openrisc.net/~jonas/linuxLinus Torvalds2011-09-114-27/+96
|\ \ \ \ \
| * | | | | Add missing DMA opsJonas Bonn2011-09-112-3/+84
| * | | | | openrisc: don't use pt_regs in struct sigcontextJonas Bonn2011-09-052-24/+12
* | | | | | Merge branch 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-...Linus Torvalds2011-09-105-7/+33
|\ \ \ \ \ \
| * | | | | | ARM: 7088/1: entry: fix wrong parameter name used in do_thumb_abortJanusz Krzysztofik2011-09-101-1/+1
| * | | | | | ARM: 7080/1: l2x0: make sure I&D are not locked down on initLinus Walleij2011-09-072-2/+28
| * | | | | | ARM: 7081/1: mach-integrator: fix the clocksourceLinus Walleij2011-09-071-3/+3
| * | | | | | ARM: 7067/1: mm: keep significant bits in pfn_validMark Rutland2011-09-041-1/+1
* | | | | | | Fix pointer dereference before call to pcie_bus_configure_settingsShyam Iyer2011-09-091-2/+7
* | | | | | | Merge branch 'perf-fixes-for-linus' of git://tesla.tglx.de/git/linux-2.6-tipLinus Torvalds2011-09-071-0/+3
|\ \ \ \ \ \ \
| * | | | | | | x86, perf: Check that current->mm is alive before getting user callchainAndrey Vagin2011-08-311-0/+3
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'stable/bug.fixes' of git://oss.oracle.com/git/kwilk/xenLinus Torvalds2011-09-073-3/+34
|\ \ \ \ \ \ \
| * | | | | | | xen/smp: Warn user why they keel over - nosmp or noapic and what to use instead.Konrad Rzeszutek Wilk2011-09-011-0/+10
| * | | | | | | xen: x86_32: do not enable iterrupts when returning from exception in interru...Igor Mammedov2011-09-011-3/+5
| * | | | | | | xen: use maximum reservation to limit amount of usable RAMDavid Vrabel2011-09-011-0/+19
* | | | | | | | Merge branch 'kvm-updates/3.1' of git://github.com/avikivity/kvmLinus Torvalds2011-09-071-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | KVM: Fix instruction size issue in pvclock scalingDuncan Sands2011-08-301-1/+1
* | | | | | | | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po...Linus Torvalds2011-08-316-2/+9
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | powerpc/p1023rds: Fix the error of bank-width of nor flashChunhe Lan2011-08-301-1/+1
| * | | | | | | powerpc/85xx: enable caam crypto driver by defaultKim Phillips2011-08-303-1/+6
| * | | | | | | powerpc/85xx: enable the audio drivers in the defconfigsTimur Tabi2011-08-302-0/+2
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparcLinus Torvalds2011-08-301-2/+8
|\ \ \ \ \ \ \
| * | | | | | | sparc64: Only Panther cheetah+ chips have POPC.David S. Miller2011-08-291-2/+8
* | | | | | | | Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2011-08-2921-50/+111
|\ \ \ \ \ \ \ \
| * | | | | | | | ARM: pm: avoid writing the auxillary control register for ARMv7Russell King2011-08-281-1/+3
| * | | | | | | | ARM: pm: some ARMv7 requires a dsb in resume to ensure correctnessRussell King2011-08-281-0/+1
| * | | | | | | | ARM: pm: arm920/926: fix number of registers savedRussell King2011-08-282-2/+2
| * | | | | | | | ARM: pm: CPU specific code should not overwrite r1 (v:p offset)Russell King2011-08-282-8/+8
| * | | | | | | | ARM: 7066/1: proc-v7: disable SCTLR.TE when disabling MMUWill Deacon2011-08-281-0/+1
| * | | | | | | | ARM: 7065/1: kexec: ensure new kernel is entered in ARM stateWill Deacon2011-08-281-1/+2
OpenPOWER on IntegriCloud