summaryrefslogtreecommitdiffstats
path: root/arch
Commit message (Expand)AuthorAgeFilesLines
*-------. Merge branches 'dmtimer_precleanup_3.1', 'hwmod_core_cleanup_a_3.1', 'combine...Paul Walmsley2011-07-0926-3176/+2116
|\ \ \ \ \
| | | | | * OMAP: omap_device: replace _find_by_pdev() with to_omap_device()Kevin Hilman2011-07-091-10/+5
| | | | * | OMAP PM: remove OMAP_PM_NONE config optionJean Pihet2011-07-092-11/+0
| | | | * | OMAP4: clockdomain data: Fix data order and wrong nameBenoit Cousson2011-07-091-61/+63
| | | | * | OMAP4: prcm_mpu: Fix indent in few macrosBenoit Cousson2011-07-091-35/+34
| | | | * | OMAP4: cm: Remove RESTORE macros to avoid access from SWBenoit Cousson2011-07-093-455/+254
| | | | * | OMAP4: powerdomain data: Fix indentationBenoit Cousson2011-07-091-9/+9
| | | | * | OMAP4: prm: Remove wrong clockdomain offsetsBenoit Cousson2011-07-091-12/+0
| | | | * | OMAP4: prcm: Fix errors in few defines nameBenoit Cousson2011-07-093-37/+36
| | | | |/
| | | * | OMAP4: clock data: Remove UNIPRO clock nodesJon Hunter2011-07-091-60/+0
| | | * | OMAP4: clock data: Remove McASP2, McASP3 and MMC6 clocksJon Hunter2011-07-091-55/+31
| | | * | OMAP4: clock data: Fix max mult and div for USB DPLLBenoit Cousson2011-07-093-23/+15
| | | * | OMAP4: clock data: Re-order some clock nodes and structure fieldsBenoit Cousson2011-07-091-32/+34
| | | * | OMAP4: clock data: Remove usb_host_fs clkdev with NULL devBenoit Cousson2011-07-091-3/+0
| | | * | OMAP4: clock data: Add sddiv to USB DPLLBenoit Cousson2011-07-091-0/+1
| | | |/
| | * | OMAP4: hwmod data: Align interconnect format with regular modulesBenoit Cousson2011-07-091-18/+18
| | * | OMAP4: hwmod data: Fix bad alignementBenoit Cousson2011-07-091-22/+23
| | * | OMAP4: hwmod data: Remove un-needed parensBenoit Cousson2011-07-091-2/+2
| | * | OMAP4: hwmod data: Fix L3 interconnect data order and alignementBenoit Cousson2011-07-091-14/+13
| | * | omap_hwmod: share identical omap_hwmod_class, omap_hwmod_class_sysconfig arraysPaul Walmsley2011-07-096-643/+364
| | * | omap_hwmod: share identical omap_hwmod_dma_info arraysPaul Walmsley2011-07-097-260/+144
| | * | omap_hwmod: use a terminator record with omap_hwmod_dma_info arraysPaul Walmsley2011-07-096-87/+106
| | * | omap_hwmod: share identical omap_hwmod_mpu_irqs arraysPaul Walmsley2011-07-097-423/+275
| | * | omap_hwmod: use a terminator record with omap_hwmod_mpu_irqs arraysPaul Walmsley2011-07-096-180/+205
| | * | omap_hwmod: share identical omap_hwmod_addr_space arraysPaul Walmsley2011-07-097-699/+414
| | * | omap_hwmod: use a null structure record to terminate omap_hwmod_addr_space ar...Paul Walmsley2011-07-096-225/+249
| | |/
| * | OMAP: hwmod: Move pr_debug to improve the readabilityBenoit Cousson2011-07-091-15/+17
| * | OMAP: hwmod: Add warnings if enable failedBenoit Cousson2011-07-091-0/+2
| * | OMAP2+: hwmod: Fix the HW reset managementBenoit Cousson2011-07-091-16/+16
| * | OMAP2+: hwmod: Remove _populate_mpu_rt_base warningBenoit Cousson2011-07-091-3/+0
| * | OMAP2+: hwmod: Do not write the enawakeup bit if SYSC_HAS_ENAWAKEUP is not setBenoit Cousson2011-07-091-10/+4
| * | OMAP2+: hwmod: Enable module in shutdown to access sysconfigMiguel Vadillo2011-07-091-1/+4
| * | OMAP4: hwmod data: Add MSTANDBY_SMART_WKUP flagBenoit Cousson2011-07-091-4/+5
| * | OMAP2+: hwmod: Fix smart-standby + wakeup supportBenoit Cousson2011-07-092-7/+29
| |/
* / OMAP: dmtimer: add missing includePaul Walmsley2011-07-091-0/+1
|/
* Merge branch 'cleanup-part-2' of git+ssh://master.kernel.org/pub/scm/linux/ke...Arnd Bergmann2011-07-0824-988/+492
|\
| * Merge branch 'peter/topic/for-tony_mach-cleanup' of git://gitorious.org/omap-...Tony Lindgren2011-07-0721-972/+489
| |\
| | * OMAP3: Move common regulator configuration to twl-commonPeter Ujfalusi2011-07-0414-420/+124
| | * OMAP3: Move common twl configuration to twl-commonPeter Ujfalusi2011-07-0416-257/+99
| | * OMAP4: Move common twl6030 configuration to twl-commonPeter Ujfalusi2011-07-044-265/+205
| | * OMAP: New twl-common for common TWL configurationPeter Ujfalusi2011-07-045-46/+77
| * | omap: mcbsp: Remove port number enumsJarkko Nikula2011-07-072-11/+3
| * | omap: mcbsp: Remove rx_/tx_word_length variablesJarkko Nikula2011-07-072-5/+0
| |/
* / omap2+: fix build regressionArnd Bergmann2011-06-301-1/+1
|/
* Merge branch 'for_3.1/pm-misc' of git://git.kernel.org/pub/scm/linux/kernel/g...Tony Lindgren2011-06-299-385/+51
|\
| * OMAP2+: PM: fix section mismatch in pm_dbg_init()Sanjeev Premi2011-06-271-1/+1
| * OMAP3: PM debug: remove register dumpingKevin Hilman2011-06-272-225/+0
| * OMAP2: PM debug: remove register dumpingKevin Hilman2011-06-203-127/+2
| * OMAP3: PM debug: remove sleep_while_idle featureKevin Hilman2011-06-203-7/+0
| * OMAP3+: SR: fix cosmetic indentationNishanth Menon2011-06-201-10/+10