diff options
author | Paul Walmsley <paul@pwsan.com> | 2012-07-04 06:05:51 -0600 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2012-07-04 06:05:51 -0600 |
commit | 8cb8de5d87b75f2ecaa1189079764340ea366c0e (patch) | |
tree | 6f2bba856baa4d637fb30c2872fa98d8016810bf /arch/arm/plat-omap/include | |
parent | 768c69f5e9227a855a7bbb490b18628133fa891a (diff) | |
parent | d49cae924faeffe8fb6b50493ec1655731d8dbd0 (diff) | |
parent | 6668546f3bb4cc0dde75ac1ef1d436b67e4ef638 (diff) | |
download | talos-obmc-linux-8cb8de5d87b75f2ecaa1189079764340ea366c0e.tar.gz talos-obmc-linux-8cb8de5d87b75f2ecaa1189079764340ea366c0e.zip |
Merge branches 'hwmod_am335x_support_3.6', 'clkdm_pwrdm_devel_a_3.6' and 'misc_devel_3.6' into omap_devel_f_3.6