summaryrefslogtreecommitdiffstats
path: root/arch
Commit message (Expand)AuthorAgeFilesLines
* Add Kconfig option ARCH_HAVE_NMI_SAFE_CMPXCHGHuang Ying2011-08-0313-0/+15
* Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po...Linus Torvalds2011-07-122-13/+20
|\
| * powerpc/mm: Fix memory_block_size_bytes() for non-pseriesBenjamin Herrenschmidt2011-07-121-11/+19
| * mm: Move definition of MIN_MEMORY_BLOCK_SIZE to a headerBenjamin Herrenschmidt2011-07-121-2/+1
* | Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/lin...Linus Torvalds2011-07-129-30/+32
|\ \ | |/ |/|
| * Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/px...Arnd Bergmann2011-07-112-22/+24
| |\
| | * ARM: pxa/raumfeld: fix device name for codec ak4104Daniel Mack2011-07-111-4/+4
| | * ARM: pxa/raumfeld: display initialisation fixesSven Neumann2011-07-111-14/+15
| | * ARM: pxa/raumfeld: adapt to upcoming hardware changeSven Neumann2011-07-111-5/+6
| | * ARM: pxa: fix gpio_to_chip() clash with gpiolib namespaceLinus Walleij2011-07-111-5/+5
| * | genirq: replace irq_gc_ack() with {set,clr}_bit variants (fwd)Simon Guinot2011-07-074-4/+4
| * | arm: mach-vt8500: add forgotten irq_data conversionWolfram Sang2011-07-071-9/+12
| |/
| * ARM: pxa168: correct nand pmu settingLei Wen2011-07-061-1/+1
| * ARM: pxa910: correct nand pmu settingLei Wen2011-07-061-1/+1
| * ARM: pxa: fix PGSR register address calculationPaul Parsons2011-07-061-2/+2
* | Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2011-07-109-23/+42
|\ \
| * | ARM: 6994/1: smp_twd: Fix typo in 'twd_timer_rate' printingVitaly Kuzmichev2011-07-071-1/+1
| * | ARM: 6987/1: l2x0: fix disabling function to avoid deadlockWill Deacon2011-07-061-6/+13
| * | ARM: 6966/1: ep93xx: fix inverted RTS/DTR signals on uart1Petr Štetiar2011-07-061-2/+2
| * | ARM: 6979/1: mach-vt8500: add forgotten irq_data conversionWolfram Sang2011-07-061-9/+12
| * | ARM: move memory layout sanity checking before meminfo initializationRussell King2011-07-053-2/+9
| * | ARM: 6989/1: perf: do not start the PMU when no events are presentWill Deacon2011-07-051-2/+4
| * | ARM: dmabounce: fix map_single() error return valueRussell King2011-07-031-1/+1
* | | Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2011-07-0813-20/+36
|\ \ \
| * | | ARM: S3C2440: fix section mismatch on mini2440Wolfram Sang2011-07-081-1/+1
| * | | ARM: S3C24XX: drop return codes in void function of dma.cWolfram Sang2011-07-081-3/+1
| * | | ARM: S3C24XX: don't use uninitialized variable in dma.cWolfram Sang2011-07-081-6/+2
| * | | ARM: EXYNOS4: Set appropriate I2C device variantSylwester Nawrocki2011-07-061-0/+6
| * | | Merge branch 'for-spi' into s5p-fixes-for-linusKukjin Kim2011-07-065-0/+13
| |\ \ \
| | * | | ARM: SAMSUNG: Add tx_st_done variablePadmavathi Venna2011-07-065-0/+13
| | | |/ | | |/|
| * | | ARM: S5PC100: Fix for compilation errorPadmavathi Venna2011-07-061-0/+1
| * | | ARM: EXYNOS4: Address a section mismatch w/ suspend issue.MyungJoo Ham2011-07-061-1/+1
| * | | ARM: S5P: Fix bug on init of PWMTimers for HRTimerSangbeom Kim2011-07-061-2/+2
| * | | ARM: SAMSUNG: header file revised to prevent declaring duplicatedMyungJoo Ham2011-07-061-0/+6
| * | | ARM: EXYNOS4: fix improper gpio configurationNaveen Krishna Chatradhi2011-07-061-1/+1
| * | | ARM: EXYNOS4: Fix card detection for sdhci 0 and 2Thomas Abraham2011-07-061-6/+2
| |/ /
* | | Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2011-07-085-19/+19
|\ \ \
| * | | omap: drop __initdata tags from static struct platform_device declarationsJanusz Krzysztofik2011-07-045-19/+19
* | | | Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2011-07-071-28/+28
|\ \ \ \
| * | | | xen/pci: Move check for acpi_sci_override_gsi to xen_setup_acpi_sci.Konrad Rzeszutek Wilk2011-07-071-28/+28
* | | | | Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2011-07-076-3/+36
|\ \ \ \ \
| * | | | | x86: Don't use the EFI reboot method by defaultMatthew Garrett2011-07-071-3/+0
| * | | | | x86, suspend: Restore MISC_ENABLE MSR in realmode wakeupKees Cook2011-07-063-0/+26
| * | | | | x86, reboot: Acer Aspire One A110 reboot quirkPeter Chubb2011-07-051-0/+8
| * | | | | x86-32, NUMA: Fix boot regression caused by NUMA init unification on highmem ...Tejun Heo2011-07-011-0/+2
| | | | | |
| \ \ \ \ \
| \ \ \ \ \
| \ \ \ \ \
*---. \ \ \ \ \ Merge branches 'core-urgent-for-linus', 'perf-urgent-for-linus' and 'sched-ur...Linus Torvalds2011-07-071-4/+10
|\ \ \ \ \ \ \ \ | | | |/ / / / / | | | | | | / / | |_|_|_|_|/ / |/| | | | | |
| | * | | | | Merge branch 'for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/...Ingo Molnar2011-06-221-4/+10
| | |\ \ \ \ \
| | | * | | | | oprofile, x86: Fix race in nmi handler while starting countersRobert Richter2011-06-151-4/+10
* | | | | | | | Merge branch 'at91/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ar...Linus Torvalds2011-07-0418-32/+32
|\ \ \ \ \ \ \ \
| * | | | | | | | AT91: Change nand buswidth logic to match hardware default configurationNicolas Ferre2011-07-047-11/+11
OpenPOWER on IntegriCloud