summaryrefslogtreecommitdiffstats
path: root/arch
Commit message (Expand)AuthorAgeFilesLines
* doc: Konfig: Documentation/power/{pm => apm-acpi}.txtMichael Witten2011-07-111-2/+2
* Merge branch 'master' into for-nextJiri Kosina2011-07-11200-655/+1230
|\
| * 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
| | * | | | | | | | at91: Use "pclk" as con_id on at91cap9 and at91rm9200Joachim Eastwood2011-06-252-5/+5
| | * | | | | | | | at91: fix udc, ehci and mmc clock device name for cap9/9g45/9rlJean-Christophe PLAGNIOL-VILLARD2011-06-253-9/+9
| | * | | | | | | | at91: fix at91_set_serial_console: use platform device idJean-Christophe PLAGNIOL-VILLARD2011-06-257-7/+7
| * | | | | | | | | Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2011-07-012-2/+28
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | / / / | | | |_|_|_|/ / / | | |/| | | | | |
| | * | | | | | | xen/pci: Use the INT_SRC_OVR IRQ (instead of GSI) to preset the ACPI SCI IRQ.Konrad Rzeszutek Wilk2011-06-301-2/+24
| | * | | | | | | xen/mmu: Fix for linker errors when CONFIG_SMP is not defined.Konrad Rzeszutek Wilk2011-06-301-0/+4
| * | | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdogLinus Torvalds2011-06-301-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | watchdog: Intel SCU Watchdog: Fix build and remove duplicate codeJesper Juhl2011-06-281-1/+1
| | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2011-06-305-40/+94
| |\ \ \ \ \ \ \ \
| | * | | | | | | | sh: use printk_ratelimited instead of printk_ratelimitPaul Mundt2011-06-302-7/+8
| | * | | | | | | | sh: Fix up unmet dependency warnings with USB EHCI/OHCI selects.Paul Mundt2011-06-301-5/+5
| | * | | | | | | | sh: fix the value of sh_dmae_slave_config in setup-sh7757Yoshihiro Shimoda2011-06-291-16/+16
| | * | | | | | | | sh: fix the INTC vector for IRQ and IRL in setup-sh7757Yoshihiro Shimoda2011-06-291-12/+12