Linus Torvalds
0df0914d41
Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
...
* 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (258 commits)
omap: zoom: host should not pull up wl1271's irq line
arm: plat-omap: iommu: fix request_mem_region() error path
OMAP2+: Common CPU DIE ID reading code reads wrong registers for OMAP4430
omap4: mux: Remove duplicate mux modes
omap: iovmm: don't check 'da' to set IOVMF_DA_FIXED flag
omap: iovmm: disallow mapping NULL address when IOVMF_DA_ANON is set
omap2+: mux: Fix compile when CONFIG_OMAP_MUX is not selected
omap4: board-omap4panda: Initialise the serial pads
omap3: board-3430sdp: Initialise the serial pads
omap4: board-4430sdp: Initialise the serial pads
omap2+: mux: Add macro for configuring static with omap_hwmod_mux_init
omap2+: mux: Remove the use of IDLE flag
omap2+: Add separate list for dynamic pads to mux
perf: add OMAP support for the new power events
OMAP4: Add IVA OPP enteries.
OMAP4: Update Voltage Rail Values for MPU, IVA and CORE
OMAP4: Enable 800 MHz and 1 GHz MPU-OPP
OMAP3+: OPP: Replace voltage values with Macros
OMAP3: wdtimer: Fix CORE idle transition
Watchdog: omap_wdt: add fine grain runtime-pm
...
Fix up various conflicts in
- arch/arm/mach-omap2/board-omap3evm.c
- arch/arm/mach-omap2/clock3xxx_data.c
- arch/arm/mach-omap2/usb-musb.c
- arch/arm/plat-omap/include/plat/usb.h
- drivers/usb/musb/musb_core.h
2011-03-17 19:28:15 -07:00
..
2011-03-17 19:28:15 -07:00
2011-03-02 17:11:18 -08:00
2011-03-17 19:28:15 -07:00
2011-03-17 19:28:15 -07:00
2011-03-17 19:28:15 -07:00
2011-03-17 19:28:15 -07:00
2011-03-17 19:28:15 -07:00
2011-02-25 10:19:21 -08:00
2011-03-17 19:28:15 -07:00
2011-03-17 19:28:15 -07:00
2011-03-17 19:28:15 -07:00
2011-02-25 10:19:21 -08:00
2011-02-17 15:32:52 -08:00
2011-02-25 10:19:21 -08:00
2011-03-10 09:51:29 -08:00
2011-03-17 19:28:15 -07:00
2011-03-17 19:28:15 -07:00
2011-03-02 16:45:50 -08:00
2011-03-01 13:12:55 -08:00
2011-03-17 19:28:15 -07:00
2011-03-17 19:28:15 -07:00
2011-02-14 15:40:20 -08:00
2011-03-17 19:28:15 -07:00
2011-03-17 19:28:15 -07:00
2011-03-17 19:28:15 -07:00
2011-03-17 19:28:15 -07:00
2011-03-17 19:28:15 -07:00
2011-03-01 13:13:27 -08:00
2011-03-02 17:11:18 -08:00
2011-02-23 09:34:25 +02:00
2011-02-25 10:19:21 -08:00
2011-02-25 10:19:21 -08:00
2010-10-08 10:02:49 -07:00
2011-02-23 09:34:25 +02:00
2011-03-02 17:11:18 -08:00
2011-03-17 19:28:15 -07:00
2011-03-07 20:02:13 -07:00
2011-03-07 20:02:05 -07:00
2010-12-21 21:05:14 -07:00
2011-03-07 20:02:21 -07:00
2010-12-21 20:01:55 -07:00
2010-12-21 21:05:14 -07:00
2010-02-24 12:16:15 -07:00
2011-02-16 17:49:35 -08:00
Merge remote branches 'remotes/origin/pwrdm_clkdm_b_2.6.39', 'remotes/origin/pwrdm_add_can_lose_context_fns_2.6.39', 'remotes/origin/omap_device_a_2.6.39', 'remotes/origin/mmc_a_2.6.39', 'remotes/origin/hwmod_b_2.6.39', 'remotes/origin/dmtimer_a_2.6.39', 'remotes/origin/pwrdm_clkdm_a_2.6.39', 'remotes/origin/clkdm_statdep_omap4_2.6.39', 'remotes/origin/clk_a_2.6.39', 'remotes/origin/clk_autoidle_a_2.6.39', 'remotes/origin/clk_autoidle_b_2.6.39', 'remotes/origin/clk_b_2.6.39', 'remotes/origin/clk_clkdm_a_2.6.39', 'remotes/origin/misc_a_2.6.39', 'remotes/origin/for_2.6.39/omap3_hwmod_data' and 'remotes/origin/wdtimer_a_2.6.39' into tmp-integration-2.6.39-20110310-024
2011-03-10 22:41:28 -07:00
2011-03-07 20:03:12 -07:00
2010-02-24 17:45:15 -07:00
2011-03-09 18:44:28 -07:00
2011-03-17 19:28:15 -07:00
2011-02-25 16:10:42 -07:00
2010-02-24 12:16:15 -07:00
2011-03-07 20:04:03 -07:00
2011-03-07 20:04:03 -07:00
2010-02-24 12:16:15 -07:00
2010-02-24 12:16:15 -07:00
2011-03-17 19:28:15 -07:00
2010-02-24 12:16:15 -07:00
2011-03-07 20:21:17 -07:00
Merge remote branches 'remotes/origin/pwrdm_clkdm_b_2.6.39', 'remotes/origin/pwrdm_add_can_lose_context_fns_2.6.39', 'remotes/origin/omap_device_a_2.6.39', 'remotes/origin/mmc_a_2.6.39', 'remotes/origin/hwmod_b_2.6.39', 'remotes/origin/dmtimer_a_2.6.39', 'remotes/origin/pwrdm_clkdm_a_2.6.39', 'remotes/origin/clkdm_statdep_omap4_2.6.39', 'remotes/origin/clk_a_2.6.39', 'remotes/origin/clk_autoidle_a_2.6.39', 'remotes/origin/clk_autoidle_b_2.6.39', 'remotes/origin/clk_b_2.6.39', 'remotes/origin/clk_clkdm_a_2.6.39', 'remotes/origin/misc_a_2.6.39', 'remotes/origin/for_2.6.39/omap3_hwmod_data' and 'remotes/origin/wdtimer_a_2.6.39' into tmp-integration-2.6.39-20110310-024
2011-03-10 22:41:28 -07:00
2010-12-21 20:01:55 -07:00
2011-03-07 20:04:03 -07:00
2010-02-24 12:16:15 -07:00
2011-03-07 20:21:17 -07:00
2011-03-11 07:21:44 -08:00
2011-03-07 20:21:17 -07:00
2011-02-25 16:06:48 -07:00
2011-02-25 16:09:05 -07:00
Merge remote branches 'remotes/origin/pwrdm_clkdm_b_2.6.39', 'remotes/origin/pwrdm_add_can_lose_context_fns_2.6.39', 'remotes/origin/omap_device_a_2.6.39', 'remotes/origin/mmc_a_2.6.39', 'remotes/origin/hwmod_b_2.6.39', 'remotes/origin/dmtimer_a_2.6.39', 'remotes/origin/pwrdm_clkdm_a_2.6.39', 'remotes/origin/clkdm_statdep_omap4_2.6.39', 'remotes/origin/clk_a_2.6.39', 'remotes/origin/clk_autoidle_a_2.6.39', 'remotes/origin/clk_autoidle_b_2.6.39', 'remotes/origin/clk_b_2.6.39', 'remotes/origin/clk_clkdm_a_2.6.39', 'remotes/origin/misc_a_2.6.39', 'remotes/origin/for_2.6.39/omap3_hwmod_data' and 'remotes/origin/wdtimer_a_2.6.39' into tmp-integration-2.6.39-20110310-024
2011-03-10 22:41:28 -07:00
Merge remote branches 'remotes/origin/pwrdm_clkdm_b_2.6.39', 'remotes/origin/pwrdm_add_can_lose_context_fns_2.6.39', 'remotes/origin/omap_device_a_2.6.39', 'remotes/origin/mmc_a_2.6.39', 'remotes/origin/hwmod_b_2.6.39', 'remotes/origin/dmtimer_a_2.6.39', 'remotes/origin/pwrdm_clkdm_a_2.6.39', 'remotes/origin/clkdm_statdep_omap4_2.6.39', 'remotes/origin/clk_a_2.6.39', 'remotes/origin/clk_autoidle_a_2.6.39', 'remotes/origin/clk_autoidle_b_2.6.39', 'remotes/origin/clk_b_2.6.39', 'remotes/origin/clk_clkdm_a_2.6.39', 'remotes/origin/misc_a_2.6.39', 'remotes/origin/for_2.6.39/omap3_hwmod_data' and 'remotes/origin/wdtimer_a_2.6.39' into tmp-integration-2.6.39-20110310-024
2011-03-10 22:41:28 -07:00
2011-03-07 20:21:17 -07:00
Merge remote branches 'remotes/origin/pwrdm_clkdm_b_2.6.39', 'remotes/origin/pwrdm_add_can_lose_context_fns_2.6.39', 'remotes/origin/omap_device_a_2.6.39', 'remotes/origin/mmc_a_2.6.39', 'remotes/origin/hwmod_b_2.6.39', 'remotes/origin/dmtimer_a_2.6.39', 'remotes/origin/pwrdm_clkdm_a_2.6.39', 'remotes/origin/clkdm_statdep_omap4_2.6.39', 'remotes/origin/clk_a_2.6.39', 'remotes/origin/clk_autoidle_a_2.6.39', 'remotes/origin/clk_autoidle_b_2.6.39', 'remotes/origin/clk_b_2.6.39', 'remotes/origin/clk_clkdm_a_2.6.39', 'remotes/origin/misc_a_2.6.39', 'remotes/origin/for_2.6.39/omap3_hwmod_data' and 'remotes/origin/wdtimer_a_2.6.39' into tmp-integration-2.6.39-20110310-024
2011-03-10 22:41:28 -07:00
2010-12-21 21:05:15 -07:00
2010-12-21 21:05:15 -07:00
2011-03-07 20:02:13 -07:00
2011-03-07 20:02:13 -07:00
2010-12-21 21:05:14 -07:00
2011-02-25 16:09:05 -07:00
2011-03-07 20:02:57 -07:00
2010-12-21 21:05:15 -07:00
2010-12-21 20:01:55 -07:00
2010-12-21 20:01:55 -07:00
2011-02-25 16:09:05 -07:00
2011-02-25 16:09:05 -07:00
2011-03-10 18:54:14 -08:00
2010-12-21 21:05:16 -07:00
2011-02-16 08:31:39 -08:00
2011-03-11 09:20:03 -08:00
2011-03-09 17:23:57 +05:30
2011-02-23 09:33:27 +02:00
2011-01-27 16:25:35 -08:00
2011-01-06 19:13:58 -08:00
2011-02-25 16:10:17 -07:00
2010-12-21 21:05:14 -07:00
2010-02-15 09:27:05 -08:00
2010-12-07 16:26:57 -08:00
2011-02-17 15:32:52 -08:00
2011-02-17 15:44:46 -08:00
2009-12-11 16:16:33 -08:00
2010-09-28 11:39:18 -07:00
2011-02-17 15:32:54 -08:00
2011-03-01 13:13:27 -08:00
2010-10-25 13:46:56 -07:00
2011-02-17 09:52:43 -08:00
2010-07-05 16:31:40 +03:00
2011-03-14 11:12:54 -07:00
Merge remote branches 'remotes/origin/pwrdm_clkdm_b_2.6.39', 'remotes/origin/pwrdm_add_can_lose_context_fns_2.6.39', 'remotes/origin/omap_device_a_2.6.39', 'remotes/origin/mmc_a_2.6.39', 'remotes/origin/hwmod_b_2.6.39', 'remotes/origin/dmtimer_a_2.6.39', 'remotes/origin/pwrdm_clkdm_a_2.6.39', 'remotes/origin/clkdm_statdep_omap4_2.6.39', 'remotes/origin/clk_a_2.6.39', 'remotes/origin/clk_autoidle_a_2.6.39', 'remotes/origin/clk_autoidle_b_2.6.39', 'remotes/origin/clk_b_2.6.39', 'remotes/origin/clk_clkdm_a_2.6.39', 'remotes/origin/misc_a_2.6.39', 'remotes/origin/for_2.6.39/omap3_hwmod_data' and 'remotes/origin/wdtimer_a_2.6.39' into tmp-integration-2.6.39-20110310-024
2011-03-10 22:41:28 -07:00
2010-10-08 10:12:38 -07:00
2011-02-24 14:23:17 -08:00
2011-02-16 11:32:38 -08:00
2011-03-17 19:28:15 -07:00
2011-03-10 18:54:14 -08:00
2011-03-17 19:28:15 -07:00
2005-11-10 14:26:51 +00:00
2011-02-24 13:03:52 -08:00
2011-01-06 19:58:28 -08:00
2009-12-11 16:16:33 -08:00
2011-03-14 09:51:14 -07:00
2010-11-17 12:01:52 +01:00
2010-11-17 12:01:54 +01:00
2010-07-05 16:31:36 +03:00
2010-11-17 12:01:54 +01:00
2010-07-05 16:31:36 +03:00
2011-03-11 11:32:25 -08:00
2011-03-11 11:32:26 -08:00
2011-03-09 00:18:47 +00:00
2011-03-09 16:38:36 -08:00
2011-03-10 22:43:32 -07:00
2011-03-09 17:23:57 +05:30
2011-03-10 22:43:05 -07:00
2011-03-10 22:43:05 -07:00
2010-07-26 16:34:31 -06:00
2010-07-26 16:34:31 -06:00
2011-03-11 11:32:25 -08:00
2011-03-09 17:23:58 +05:30
2011-03-09 17:23:58 +05:30
2011-03-09 17:23:57 +05:30
2011-03-09 17:23:57 +05:30
2011-03-10 22:17:45 -07:00
2011-03-17 19:28:15 -07:00
2011-03-11 09:20:03 -08:00
2011-03-09 16:38:36 -08:00
2010-12-20 15:09:10 +00:00
2010-12-15 11:33:31 -06:00
2011-01-06 22:32:52 +00:00
2011-01-27 16:39:40 -08:00
2011-03-11 09:39:58 -08:00
2011-03-11 09:39:58 -08:00
2010-01-08 15:23:15 -07:00
2010-01-08 15:23:15 -07:00
2010-12-21 14:30:40 -08:00
2011-03-11 09:20:03 -08:00
2011-03-11 09:39:58 -08:00
2011-01-13 10:05:56 -08:00
2011-01-07 13:33:08 -08:00
2011-02-04 12:08:12 -08:00
2011-03-11 09:20:03 -08:00
2011-03-17 19:28:15 -07:00
2011-01-18 12:36:53 -07:00
2010-12-21 21:05:16 -07:00
2010-12-21 21:05:16 -07:00
2011-03-11 07:21:44 -08:00
Merge remote branches 'remotes/origin/pwrdm_clkdm_b_2.6.39', 'remotes/origin/pwrdm_add_can_lose_context_fns_2.6.39', 'remotes/origin/omap_device_a_2.6.39', 'remotes/origin/mmc_a_2.6.39', 'remotes/origin/hwmod_b_2.6.39', 'remotes/origin/dmtimer_a_2.6.39', 'remotes/origin/pwrdm_clkdm_a_2.6.39', 'remotes/origin/clkdm_statdep_omap4_2.6.39', 'remotes/origin/clk_a_2.6.39', 'remotes/origin/clk_autoidle_a_2.6.39', 'remotes/origin/clk_autoidle_b_2.6.39', 'remotes/origin/clk_b_2.6.39', 'remotes/origin/clk_clkdm_a_2.6.39', 'remotes/origin/misc_a_2.6.39', 'remotes/origin/for_2.6.39/omap3_hwmod_data' and 'remotes/origin/wdtimer_a_2.6.39' into tmp-integration-2.6.39-20110310-024
2011-03-10 22:41:28 -07:00
2011-03-07 19:28:15 -07:00
2010-12-21 21:05:16 -07:00
Merge remote branches 'remotes/origin/pwrdm_clkdm_b_2.6.39', 'remotes/origin/pwrdm_add_can_lose_context_fns_2.6.39', 'remotes/origin/omap_device_a_2.6.39', 'remotes/origin/mmc_a_2.6.39', 'remotes/origin/hwmod_b_2.6.39', 'remotes/origin/dmtimer_a_2.6.39', 'remotes/origin/pwrdm_clkdm_a_2.6.39', 'remotes/origin/clkdm_statdep_omap4_2.6.39', 'remotes/origin/clk_a_2.6.39', 'remotes/origin/clk_autoidle_a_2.6.39', 'remotes/origin/clk_autoidle_b_2.6.39', 'remotes/origin/clk_b_2.6.39', 'remotes/origin/clk_clkdm_a_2.6.39', 'remotes/origin/misc_a_2.6.39', 'remotes/origin/for_2.6.39/omap3_hwmod_data' and 'remotes/origin/wdtimer_a_2.6.39' into tmp-integration-2.6.39-20110310-024
2011-03-10 22:41:28 -07:00
2011-03-07 19:28:15 -07:00
2011-03-07 19:28:15 -07:00
2010-12-21 21:05:14 -07:00
2010-12-21 21:05:14 -07:00
2011-03-01 16:36:20 -07:00
2011-03-02 17:11:18 -08:00
2011-01-27 16:39:48 -08:00
2011-03-10 03:23:56 -07:00
2011-03-10 03:23:56 -07:00
2010-12-21 21:05:14 -07:00
2010-12-21 21:05:15 -07:00
2010-12-21 20:01:55 -07:00
2010-12-21 20:01:55 -07:00
2010-12-21 20:01:55 -07:00
2010-12-21 20:01:55 -07:00
2010-12-21 21:05:14 -07:00
2010-12-21 21:05:14 -07:00
2010-12-21 20:01:54 -07:00
2009-11-22 10:24:33 -08:00
2009-10-20 09:40:47 -07:00
2010-12-17 15:13:46 -08:00
2010-12-17 15:13:44 -08:00
2010-02-17 17:23:20 -08:00
2009-10-20 09:40:47 -07:00
2010-12-21 21:05:14 -07:00
2010-12-21 20:01:55 -07:00
2010-12-21 14:45:56 -08:00
2011-02-28 12:04:35 -07:00
2011-02-04 14:26:08 +00:00
2011-03-17 19:28:15 -07:00
2011-03-07 20:05:08 -07:00
2011-03-11 09:20:03 -08:00
2011-03-07 20:05:08 -07:00
2011-03-07 20:05:08 -07:00
2011-03-17 19:28:15 -07:00
2011-02-04 14:26:08 +00:00
2011-02-04 14:26:08 +00:00
2011-03-02 17:07:14 -08:00
2010-10-08 10:02:49 -07:00
2010-02-23 15:29:08 -08:00
2010-10-08 11:40:20 -06:00
2011-03-01 17:02:44 +02:00
2011-03-17 19:28:15 -07:00
2011-01-07 13:16:28 -08:00
2011-03-10 22:17:45 -07:00
2011-03-10 22:17:45 -07:00
2011-03-10 22:17:45 -07:00
2011-03-10 22:17:45 -07:00
2011-03-10 22:17:45 -07:00
2011-03-10 22:17:45 -07:00
2011-03-10 22:17:45 -07:00
2011-03-10 22:17:45 -07:00
2011-03-10 22:17:45 -07:00
2011-03-10 22:17:45 -07:00
2011-01-06 19:58:28 -08:00
2010-12-21 19:56:17 -07:00