summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'for-linus-3.5-20120601' of git://git.infradead.org/linux-mtdLinus Torvalds2012-06-011-0/+11
|\
| * ARM: OMAP3: gpmc: add BCH ecc api and modesIvan Djelic2012-05-131-0/+11
* | Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm...Linus Torvalds2012-05-269-190/+56
|\ \
| * \ Merge tag 'omap-cleanup-timer-for-v3.5' of git://git.kernel.org/pub/scm/linux...Olof Johansson2012-05-102-53/+40
| |\ \
| | * | ARM: OMAP: Make OMAP clocksource source selection using kernel paramVaibhav Hiremath2012-05-092-53/+40
| * | | Merge tag 'omap-cleanup-devices-for-v3.5' of git://git.kernel.org/pub/scm/lin...Olof Johansson2012-05-105-135/+42
| |\ \ \
| | * | | ARM: OMAP: Move omap_mmc_add() to mach-omap1Tony Lindgren2012-05-092-57/+0
| | * | | ARM: OMAP2+: Move omap_dsp_reserve_sdram_memblock() to mach-omap2Tony Lindgren2012-05-091-29/+0
| | * | | ARM: OMAP1: Move omap_init_uwire to mach-omap1Tony Lindgren2012-05-091-45/+0
| | * | | Merge branch 'fixes-non-critical' into cleanup-devicesTony Lindgren2012-05-094-8/+23
| | |\ \ \ | | | |/ / | | |/| |
| * | | | Merge tag 'omap-cleanup-renames-for-v3.5' of git://git.kernel.org/pub/scm/lin...Olof Johansson2012-05-102-2/+3
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | ARM: OMAP2+: dmtimer: remove redundant sysconfig context restoreTarun Kanti DebBarma2012-05-102-3/+0
| * | | | ARM: OMAP: AM35xx: convert 3517 detection/flags to AM35xxKevin Hilman2012-05-101-0/+8
| * | | | Merge branch 'cleanup-soc' into cleanupTony Lindgren2012-05-102-2/+7
| |\ \ \ \
| | * \ \ \ Merge branch 'for_3.5/omap_misc_cleanup' of git://gitorious.org/omap-sw-devel...Tony Lindgren2012-05-082-2/+7
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | ARM: OMAP2+: dma: Define dma capabilities register bitfields and use them.R Sricharan2012-05-081-0/+5
| | | * | | ARM: OMAP: dma: Make use of cpu_class_is_omap2() to avoid future patching.Santosh Shilimkar2012-05-081-2/+2
| * | | | | Merge branch 'devel-hwmod' into cleanupTony Lindgren2012-05-081-10/+31
| |\ \ \ \ \ | | |/ / / / | |/| | | |
* | | | | | Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds2012-05-241-1/+2
|\ \ \ \ \ \
| * | | | | | gpio/omap: remove cpu_is_omapxxxx() checks from *_runtime_resume()Tarun Kanti DebBarma2012-05-111-0/+2
| * | | | | | gpio/omap: remove virtual_irq_start variableTarun Kanti DebBarma2012-05-111-1/+0
| |/ / / / /
* | | | | | Merge tag 'tty-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/greg...Linus Torvalds2012-05-221-1/+0
|\ \ \ \ \ \
| * \ \ \ \ \ Merge 3.4-rc4 into tty-nextGreg Kroah-Hartman2012-04-231-1/+0
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Merge 3.4-rc3 into tty-nextGreg Kroah-Hartman2012-04-182-36/+0
| | |\ \ \ \ \
| | * | | | | | OMAP2+: UART: Remove cpu checks for populating errata flagsGovindraj.R2012-04-181-1/+0
* | | | | | | | Merge tag 'pm' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-05-225-4/+43
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge tag 'omap-devel-hwmod-data-for-v3.5' of git://git.kernel.org/pub/scm/li...Olof Johansson2012-05-102-0/+40
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | Merge tag 'omap-devel-c-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel...Tony Lindgren2012-05-092-0/+40
| | |\ \ \ \ \ \ \
| | | * | | | | | | ARM: OMAP2+: HDQ1W: add custom reset functionPaul Walmsley2012-05-081-0/+36
| | | * | | | | | | ARM: OMAP2420: hwmod data: Add MMC hwmod data for 2420Tony Lindgren2012-05-081-0/+4
| * | | | | | | | | Merge tag 'omap-devel-prcm-for-v3.5' of git://git.kernel.org/pub/scm/linux/ke...Olof Johansson2012-05-102-4/+2
| |\| | | | | | | |
| | * | | | | | | | Merge tag 'omap-devel-b-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel...Tony Lindgren2012-05-082-4/+2
| | |\| | | | | | | | | | |_|_|_|_|/ / | | |/| | | | | |
| | | | | | | | |
| | | | \ \ \ \ \
| | | *-. \ \ \ \ \ Merge branches 'clock_am35xx_cleanup_3.5', 'prm_cm_devel_a_3.5', 'clock_devel...Paul Walmsley2012-05-071-1/+1
| | | |\ \ \ \ \ \ \
| | | | | * | | | | | ARM: OMAP2+: dmtimer: cleanup iclk usageTarun Kanti DebBarma2012-05-071-1/+1
| | | | |/ / / / / /
| | | * / / / / / / ARM: OMAP: clock: convert AM3517/3505 detection/flags to AM35xxKevin Hilman2012-05-071-3/+1
| | | |/ / / / / /
| * | | / / / / / Merge tag 'omap-devel-hwmod-for-v3.5' of git://git.kernel.org/pub/scm/linux/k...Olof Johansson2012-05-091-10/+31
| |\| | | | | | | | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Merge tag 'omap-devel-a-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel...Tony Lindgren2012-04-191-0/+1
| | |\| | | | |
| | | * | | | | ARM: OMAP4: hwmod data: add some interconnect-related IP blocksPaul Walmsley2012-04-191-0/+1
* | | | | | | | Merge tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-05-222-2/+3
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | ARM: OMAP4: Adding ID for OMAP4460 ES1.1Chris Lalancette2012-05-091-0/+1
| * | | | | | | ARM: OMAP: fix trivial warnings for dspbridgeFelipe Contreras2012-05-091-2/+2
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-05-2213-136/+56
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'fixes-for-cleanup' of git://git.kernel.org/pub/scm/linux/kernel...Olof Johansson2012-05-111-1/+3
| |\ \ \ \ \ \ \
| | * | | | | | | ARM: OMAP: OTG integration: fix compiler warningPaul Walmsley2012-05-111-1/+3
| * | | | | | | | Merge tag 'v3.4-rc6' into next/cleanupOlof Johansson2012-05-091-0/+14
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Merge tag 'omap-cleanup-hwmod-for-v3.5' of git://git.kernel.org/pub/scm/linux...Olof Johansson2012-05-091-10/+30
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | Merge tag 'omap-cleanup-b-for-3.5' of git://git.kernel.org/pub/scm/linux/kern...Tony Lindgren2012-04-191-11/+33
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | / | | | |_|_|_|_|/ | | |/| | | | |
| | | * | | | | ARM: OMAP: hwmod: remove code support for direct hwmod registrationPaul Walmsley2012-04-191-7/+0
| | | * | | | | ARM: OMAP2+: hwmod: add support for link registrationPaul Walmsley2012-04-191-0/+24
| | | * | | | | ARM: OMAP2+: hwmod: extend OCP_* register offsets from 16 to 32 bitsPaul Walmsley2012-04-191-3/+3