summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Walmsley <paul@pwsan.com>2013-08-23 18:49:48 (GMT)
committerPaul Walmsley <paul@pwsan.com>2013-08-23 18:49:48 (GMT)
commit4514b4d7fcad2a84066c73966c6a7823ea1b3749 (patch)
treec4dc890fb6ee8a8bd02e8bd23c96a53435a341af
parent127500ccb766f0e963436e25ddd57be8f1695498 (diff)
parent0f0dd08932d4eb0fb336e6c2a48f27855b99ead2 (diff)
parentb84a76ae73b915124a5466035f187ab20a49fb6e (diff)
downloadlinux-fsl-qoriq-4514b4d7fcad2a84066c73966c6a7823ea1b3749.tar.xz
Merge branches 'hwmod_devel_v3.12', 'prcm_devel_v3.12' and 'am33xx_devel_v3.12' into prcm_a_for_v3.12