diff options
| author | Paul Walmsley <paul@pwsan.com> | 2011-03-10 22:43:32 -0700 |
|---|---|---|
| committer | Paul Walmsley <paul@pwsan.com> | 2011-03-10 22:43:32 -0700 |
| commit | a08572ae529b1e8de12393eeced661feae8fd44c (patch) | |
| tree | e9b48848ab72c953d778832336eb8e1d43abdc8d /arch/arm/Kconfig-nommu | |
| parent | 2d403fe03070b541cc93cfa915f6e6c592cf231c (diff) | |
| parent | c0718df4d666cc5fd8837ac93c82995a17bfdbf5 (diff) | |
Merge remote branch 'remotes/origin/voltage_split_2.6.39' into tmp-integration-2.6.39-20110310-024
Conflicts:
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
Diffstat (limited to 'arch/arm/Kconfig-nommu')
0 files changed, 0 insertions, 0 deletions