diff options
| author | Paul Walmsley <paul@pwsan.com> | 2011-03-10 22:41:28 -0700 |
|---|---|---|
| committer | Paul Walmsley <paul@pwsan.com> | 2011-03-10 22:41:28 -0700 |
| commit | 21ace5452ce3327f0d11f85b0c33dfcd0d20fdb2 (patch) | |
| tree | ec84b5e9ab22958a9bfa6e9897e706fc9540dcc0 /arch/arm | |
| parent | 694606c4ef54f596bfb2a7c1d4de8ac0e096a636 (diff) | |
| parent | da0653fe01cd4c6ed402a94752b78be62cb39282 (diff) | |
| parent | a05dcdb98011a53d150d699ef8243754e2c9a61c (diff) | |
| parent | 570b54c7fae65b65320d5a7d4b2249c86eeaa497 (diff) | |
| parent | 4ce1e5e14c4ea43f971bd546934ef40b3ae4fcf3 (diff) | |
| parent | 5f8662ba3da6e410eb771b5d8751a1e02d87513f (diff) | |
| parent | 8c810e7e14457d97706d4c6de4bb4847e3715d1b (diff) | |
| parent | 692ab1f36b714250a9669e10e5acceba72707956 (diff) | |
| parent | 478f478bc1a58f97f09fd2048488bafdfa9d8fce (diff) | |
| parent | 2f4dd595f6d60ec3ccbb68def73df457970cf671 (diff) | |
| download | blackbird-op-linux-21ace5452ce3327f0d11f85b0c33dfcd0d20fdb2.tar.gz blackbird-op-linux-21ace5452ce3327f0d11f85b0c33dfcd0d20fdb2.zip | |
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
