diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-10-08 19:20:40 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-10-08 19:20:40 +0200 |
| commit | bc3caae8a191c712d8ae666d0b8d18807bfe2b14 (patch) | |
| tree | 7b338ebba2f1fdbcee3785789bf9f4a74d93aa94 /arch/score | |
| parent | Merge branches 'devel-omap1' and 'devel-omap2plus' into omap-for-linus (diff) | |
| parent | manual merge for pm-hwmod-uart due to conflicts (diff) | |
| download | linux-bc3caae8a191c712d8ae666d0b8d18807bfe2b14.tar.xz linux-bc3caae8a191c712d8ae666d0b8d18807bfe2b14.zip | |
Merge branch 'pm-hwmods' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus
Diffstat (limited to 'arch/score')
0 files changed, 0 insertions, 0 deletions