summaryrefslogtreecommitdiffstats
path: root/arch
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'paul' (Fixups from Paul Gortmaker)Linus Torvalds2012-04-026-108/+122
|\
| * frv: fix warnings in mb93090-mb00/pci-dma.c about implicit EXPORT_SYMBOLPaul Gortmaker2012-04-021-0/+1
| * parisc: fix missing cmpxchg file error from system.h splitPaul Gortmaker2012-04-022-106/+117
| * blackfin: fix cmpxchg build fails from system.h falloutPaul Gortmaker2012-04-021-1/+2
| * avr32: fix build failures from mis-naming of atmel_nand.hPaul Gortmaker2012-04-021-1/+1
| * ARM: mach-msm: fix compile fail from system.h falloutPaul Gortmaker2012-04-021-0/+1
* | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po...Linus Torvalds2012-04-0231-50/+699
|\ \
| * | powerpc/eeh: Fix use of set_current_state() in eeh event handling set_current...Andrew Morton2012-04-021-1/+1
| * | powerpc/eeh: Remove eeh_event_handler()->daemonize()Oleg Nesterov2012-04-021-1/+1
| * | powerpc/kvm: Fallout from system.h disintegrationBenjamin Herrenschmidt2012-04-023-0/+3
| * | powerpc: Fix fallout from system.h split upStephen Rothwell2012-04-022-0/+3
| * | powerpc: Mark const init data with __initconst instead of __initdataUwe Kleine-König2012-04-023-3/+3
| * | Merge remote-tracking branch 'kumar/next' into mergeBenjamin Herrenschmidt2012-04-0222-45/+688
| |\ \ | | |/ | |/|
| | * powerpc/qe: Update the SNUM table for MPC8569 Rev2.0Dave Liu2012-03-291-2/+20
| | * powerpc/dts: Removed fsl,msi property from dts.Diana CRACIUN2012-03-295-16/+0
| | * powerpc/epapr: add "memory" as a clobber to all hypercallsTimur Tabi2012-03-291-1/+6
| | * powerpc/85xx: Enable I2C_CHARDEV and I2C_MPC options in defconfigsShaveta Leekha2012-03-294-0/+5
| | * powerpc/85xx: add the P1020UTM-PC DTS supportJerry Huang2012-03-293-0/+318
| | * powerpc/85xx: add the P1020MBG-PC DTS supportJerry Huang2012-03-293-0/+329
| | * powerpc/8xxx: remove 85xx/86xx restrictions from fsl_guts.hTimur Tabi2012-03-295-26/+10
* | | Merge tag 'for-linus' of git://github.com/rustyrussell/linuxLinus Torvalds2012-04-0222-64/+59
|\ \ \ | |/ / |/| |
| * | documentation: remove references to cpu_*_map.Rusty Russell2012-03-297-7/+7
| * | remove references to cpu_*_map in arch/Rusty Russell2012-03-2919-58/+53
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2012-03-311-3/+4
|\ \ \
| * | | new helper: ext2_image_size()Al Viro2012-03-311-3/+4
* | | | Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2012-03-315-1/+90
|\ \ \ \
| * \ \ \ Merge branch 'linus' into perf/urgentIngo Molnar2012-03-261156-33425/+22621
| |\ \ \ \
| * | | | | perf: Fix mmap_page capabilities and docsPeter Zijlstra2012-03-231-1/+9
| * | | | | Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/...Ingo Molnar2012-03-235-0/+81
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'perf/urgent' into perf/coreArnaldo Carvalho de Melo2012-03-2214-581/+1502
| | |\ \ \ \ \
| | * | | | | | perf: Adding sysfs group format attribute for pmu deviceJiri Olsa2012-03-165-0/+81
* | | | | | | | Merge tag 'parisc-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb...Linus Torvalds2012-03-312-6/+28
|\ \ \ \ \ \ \ \
| * | | | | | | | [PARISC] remove references to cpu_*_map.Rusty Russell2012-02-271-2/+1
| * | | | | | | | [PARISC] futex: Use same lock set as lws callsJohn David Anglin2012-02-271-4/+27
* | | | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparcLinus Torvalds2012-03-303-0/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | sparc32: fix fallout from system.h removalSam Ravnborg2012-03-303-0/+3
* | | | | | | | | | Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek...Linus Torvalds2012-03-307-60/+30
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Kbuild: centralize MKIMAGE and cmd_uimage definitionsStephen Warren2012-03-267-60/+30
* | | | | | | | | | Merge tag 'for-linus-3.4' of git://git.infradead.org/mtd-2.6Linus Torvalds2012-03-308-47/+88
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | mtd: do not use plain 0 as NULLArtem Bityutskiy2012-03-271-1/+1
| * | | | | | | | | | mtd: maps: physmap: Add reference counter to set_vpp()Paul Parsons2012-03-272-17/+6
| * | | | | | | | | | mtd: fsmc: Move ALE, CLE defines to their respective platformShiraz Hashim2012-03-272-0/+7
| * | | | | | | | | | ARM: mach-shmobile: mackerel: Add the flash controller flctlBastian Hecht2012-03-272-1/+74
| * | | | | | | | | | mxs-dma : move the mxs dma.h to a more common placeHuang Shijie2012-03-271-28/+0
* | | | | | | | | | | Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2012-03-3012-0/+13
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | ARM: clps711x: fix missing include fileOlof Johansson2012-03-301-0/+1
| * | | | | | | | | | | ARM: fix builds due to missing <asm/system_misc.h> includesOlof Johansson2012-03-3011-0/+12
* | | | | | | | | | | | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/...Linus Torvalds2012-03-3013-220/+166
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tboot' into releaseLen Brown2012-03-301-3/+6
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'stable/for-x86-for-3.4' of git://git.kernel.org/pub/scm/linux/k...Len Brown2012-03-221-3/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \