summaryrefslogtreecommitdiffstats
path: root/arch
Commit message (Expand)AuthorAgeFilesLines
* Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2010-03-2411-31/+102
|\
| * [ARM] Orion5x: replace KEY_WLAN with KEY_WPS_BUTTONChristian Lamparter2010-03-231-1/+1
| * [ARM] Kirkwood: WPS button keycode mappingChristian Lamparter2010-03-231-2/+2
| * Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/px...Russell King2010-03-237-25/+25
| |\
| | * [ARM] pxa/raumfeld: fix button nameDaniel Mack2010-03-221-1/+1
| | * [ARM] pxa/raumfeld: remove duplicated #includeHuang Weiyi2010-03-221-2/+0
| | * [ARM] locomo: fix unpaired spin_lock_irqsaveH Hartley Sweeten2010-03-221-3/+3
| | * [ARM] locomo: fix SPI register offsetH Hartley Sweeten2010-03-221-2/+2
| | * [ARM] pxa/sharpsl: add dependency of max1111 driver to sharpsl_pmEric Miao2010-03-221-0/+7
| | * [ARM] pxa: remove unnecessary 'select FB_W100' from some platformsEric Miao2010-03-221-4/+0
| | * [ARM] pxa: remove spi cs gpio direction to avoid clash with driverJonathan Cameron2010-03-222-9/+0
| | * [ARM] mmp: fix for variables in uncompress.h being discardedEric Miao2010-03-221-1/+4
| | * [ARM] pxa: fix for variables in uncompress.h being discardedJonathan Cameron2010-03-221-3/+8
| * | ARM: Update mach-typesRussell King2010-03-201-2/+73
| * | ARM: Fix IXP23xx build error in mach/memory.hRussell King2010-03-201-1/+1
| |/
* | Merge branch 'sh/for-2.6.34' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2010-03-2411-18/+42
|\ \
| * | sh: Silence unintialized variable warnings in dwarf unwinder.Paul Mundt2010-03-231-2/+2
| * | sh: Tidy up a couple of section mismatches.Paul Mundt2010-03-232-2/+2
| * | sh: Fix build after dynamic PMB reworkMatt Fleming2010-03-231-0/+2
| * | sh: Replace unsafe manipulation of MMUCRMatt Fleming2010-03-232-7/+16
| * | sh: Flush ITLB too in PTEAEX's flush_tlb_page()Matt Fleming2010-03-232-0/+4
| * | sh64: Remove long unused mid_sched macroAndreas Bombe2010-03-231-7/+0
| * | sh: Add watch-dog register address for SH7722/SH7723/SH7724Kuninori Morimoto2010-03-231-0/+6
| * | sh: ms7724: Add tiny-document for soundKuninori Morimoto2010-03-231-0/+8
| * | sh: mach-ecovec24: Add i2c_put_adapter on sh_eth_initKuninori Morimoto2010-03-231-0/+2
* | | [S390] fix boot failures with compressed kernelsMartin Schwidefsky2010-03-243-6/+7
* | | [S390] system.h: Fix compile error for 1 and 2 byte cmpxchgChristian Borntraeger2010-03-241-4/+4
* | | [S390] smp: fix lowcore allocationHeiko Carstens2010-03-241-2/+2
* | | [S390] zcore: CPU registers are not saved under LPARMichael Holzheu2010-03-243-3/+30
|/ /
* / x86 / perf: Fix suspend to RAM on HP nx6325Rafael J. Wysocki2010-03-221-3/+5
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6Linus Torvalds2010-03-192-0/+16
|\
| * sh: Export uncached helper symbols.Paul Mundt2010-03-101-0/+4
| * sh: Fix up NUMA build for 29-bit.Paul Mundt2010-03-101-0/+7
| * sh: Fix up uncached offset for legacy 29-bit mode.Paul Mundt2010-03-081-0/+5
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mat...Linus Torvalds2010-03-197-13/+5
|\ \
| * | alpha: fix compile errors in dma-mapping-common.hFUJITA Tomonori2010-03-184-4/+0
| * | alpha: remove trailing spaces in messagesFrans Pop2010-03-182-2/+2
| * | alpha: use __ratelimitAkinobu Mita2010-03-181-7/+3
* | | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po...Linus Torvalds2010-03-198-40/+17
|\ \ \ | |/ / |/| |
| * | powerpc: Remove IOMMU_VMERGE config optionFUJITA Tomonori2010-03-192-19/+1
| * | powerpc: Fix swiotlb to respect the boot optionFUJITA Tomonori2010-03-193-12/+6
| * | powerpc: Do not call prink when CONFIG_PRINTK is not definedMárton Németh2010-03-191-0/+4
| * | powerpc: Use correct ccr bit for syscall error statusNathan Lynch2010-03-191-3/+3
| * | Merge commit 'kumar/merge' into mergeBenjamin Herrenschmidt2010-03-192-6/+3
| |\ \
| | * | powerpc/fsl-booke: Get coherent bit from PTEKumar Gala2010-03-161-3/+0
| | * | powerpc/85xx: Make sure lwarx hint isn't set on ppc32Kumar Gala2010-03-161-3/+3
* | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vap...Linus Torvalds2010-03-18112-2273/+12548
|\ \ \ \
| * | | | Blackfin: stop cleaning include/asm/asm-offsets.hMike Frysinger2010-03-091-1/+0
| * | | | Blackfin: scale calibration when cpu freq changesGraf Yang2010-03-091-1/+12
| * | | | Blackfin: eat spurious space in asm/dpmc.hMike Frysinger2010-03-091-2/+2