diff options
author | Paul Walmsley <paul@pwsan.com> | 2013-08-23 12:49:48 -0600 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2013-08-23 12:49:48 -0600 |
commit | 4514b4d7fcad2a84066c73966c6a7823ea1b3749 (patch) | |
tree | c4dc890fb6ee8a8bd02e8bd23c96a53435a341af /arch/arm/mach-omap2 | |
parent | 127500ccb766f0e963436e25ddd57be8f1695498 (diff) | |
parent | 0f0dd08932d4eb0fb336e6c2a48f27855b99ead2 (diff) | |
parent | b84a76ae73b915124a5466035f187ab20a49fb6e (diff) | |
download | op-kernel-dev-4514b4d7fcad2a84066c73966c6a7823ea1b3749.zip op-kernel-dev-4514b4d7fcad2a84066c73966c6a7823ea1b3749.tar.gz |
Merge branches 'hwmod_devel_v3.12', 'prcm_devel_v3.12' and 'am33xx_devel_v3.12' into prcm_a_for_v3.12