summaryrefslogtreecommitdiffstats
path: root/arch
Commit message (Expand)AuthorAgeFilesLines
*-------. Merge branches 'clock_fixes_3.4rc', 'clockdomain_fixes_3.4rc', 'hsmmc_erratum...Paul Walmsley2012-04-056-58/+87
|\ \ \ \ \
| | | | | * ARM: OMAP2+: powerdomain: Wait for powerdomain transition in pwrdm_state_swit...Santosh Shilimkar2012-04-041-1/+7
| | | | * | ARM: OMAP2+: hwmod: Fix wrong SYSC_TYPE1_XXX_MASK bit definitionsVaibhav Hiremath2012-04-051-6/+6
| | | | * | ARM: OMAP2+: hwmod: Make omap_hwmod_softreset wait for reset statusRajendra Nayak2012-04-051-12/+2
| | | | * | ARM: OMAP2+: hwmod: Restore sysc after a resetRajendra Nayak2012-04-051-12/+6
| | | | * | ARM: OMAP2+: omap_hwmod: Allow io_ring wakeup configuration for all modulesGovindraj.R2012-04-051-26/+30
| | | | |/
| | | * / ARM: OMAP4: hwmod data: Add aliases for McBSP fclk clocksPaul Walmsley2012-04-041-0/+28
| | | |/
| | * / ARM: OMAP3xxx: HSMMC: avoid erratum workaround when transceiver is attachedGrazvydas Ignotas2012-04-041-0/+7
| | |/
| * / ARM: OMAP44xx: clockdomain data: correct the emu_sys_clkdm CLKTRCTRL dataPaul Walmsley2012-04-041-1/+1
| |/
* | ARM: OMAP3: clock data: fill in some missing clockdomainsPaul Walmsley2012-04-041-0/+6
* | ARM: OMAP4: clock data: Force a DPLL clkdm/pwrdm ON before a relockRajendra Nayak2012-04-041-0/+1
* | ARM: OMAP4: clock data: fix mult and div mask for USB_DPLLAmeya Palande2012-04-041-2/+2
* | ARM: OMAP AM3517/3505: clock data: change EMAC clocks aliasesIlya Yanok2012-04-041-2/+2
* | ARM: OMAP: clock: fix race in disable all clocksNishanth Menon2012-04-041-2/+3
* | ARM: OMAP3xxx: clock data: fix DPLL4 CLKSEL masksGrazvydas Ignotas2012-04-041-4/+4
|/
* 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
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | tboot: Add return values for tboot_sleepKonrad Rzeszutek Wilk2012-03-131-9/+4
| | | * | | | | | | | | | x86, acpi, tboot: Have a ACPI os prepare sleep instead of calling tboot_sleep.Tang Liang2012-03-131-0/+8
| | | | | | | | | | | | |
| | \ \ \ \ \ \ \ \ \ \ \
| *-. \ \ \ \ \ \ \ \ \ \ \ Merge branches 'acpica', 'bgrt', 'bz-11533', 'cpuidle', 'ec', 'hotplug', 'mis...Len Brown2012-03-3012-220/+165
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | ACPI: Fix use-after-free in acpi_map_lsapicPetr Vandrovec2012-03-301-1/+2
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | idle, x86: Allow off-lined CPU to enter deeper C statesBoris Ostrovsky2012-03-301-1/+3
| | * | | | | | | | | | | ARM: davinci: Fix for cpuidle consolidation changesRobert Lee2012-03-221-4/+5
| | * | | | | | | | | | | SH: shmobile: Consolidate time keeping and irq enableRobert Lee2012-03-211-7/+3
| | * | | | | | | | | | | ARM: shmobile: Consolidate time keeping and irq enableRobert Lee2012-03-211-24/+7