| commit | 69758ab7a1e2de5636a2188d5357dd03140bf1d8 | [log] [tgz] |
|---|---|---|
| author | Kevin Hilman <khilman@deeprootsystems.com> | Fri Oct 01 13:24:10 2010 -0700 |
| committer | Kevin Hilman <khilman@deeprootsystems.com> | Fri Oct 01 13:24:10 2010 -0700 |
| tree | 13d65cbee4cc6bfed697bd164a15529ad86c2b25 | |
| parent | 963bfb0939232e415c7bfb19b08dce300eb148d9 [diff] | |
| parent | 257f23d87f9309fee41d468575404b9371bf4c7d [diff] |
manual merge for pm-hwmod-uart due to conflicts