| commit | 7940a34b2e1e0485211a17d8c3ab4da1ea3e1330 | [log] [tgz] |
|---|---|---|
| author | Kevin Hilman <khilman@deeprootsystems.com> | Thu Oct 21 11:21:55 2010 -0700 |
| committer | Kevin Hilman <khilman@deeprootsystems.com> | Thu Oct 21 11:21:55 2010 -0700 |
| tree | fe08ba701cbf23ae44a16d3b7afa521fce943a8a | |
| parent | 6451d7783ba5ff24eb1a544eaa6665b890f30466 [diff] | |
| parent | 8939b3504dc35224cb9c88e5af925b22ea9eee71 [diff] |
Merge branch 'davinci-next' into davinci-for-linus Conflicts: arch/arm/mach-davinci/board-da830-evm.c arch/arm/mach-davinci/board-da850-evm.c