summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/omap_hwmod_common_data.c
diff options
context:
space:
mode:
authorPaul Walmsley <paul@pwsan.com>2012-07-04 12:05:51 (GMT)
committerPaul Walmsley <paul@pwsan.com>2012-07-04 12:05:51 (GMT)
commit8cb8de5d87b75f2ecaa1189079764340ea366c0e (patch)
tree6f2bba856baa4d637fb30c2872fa98d8016810bf /arch/arm/mach-omap2/omap_hwmod_common_data.c
parent768c69f5e9227a855a7bbb490b18628133fa891a (diff)
parentd49cae924faeffe8fb6b50493ec1655731d8dbd0 (diff)
parent6668546f3bb4cc0dde75ac1ef1d436b67e4ef638 (diff)
downloadlinux-fsl-qoriq-8cb8de5d87b75f2ecaa1189079764340ea366c0e.tar.xz
Merge branches 'hwmod_am335x_support_3.6', 'clkdm_pwrdm_devel_a_3.6' and 'misc_devel_3.6' into omap_devel_f_3.6