author | John Dowdal <jdowdal@ti.com> | |
Thu, 15 Aug 2013 19:10:32 +0000 (15:10 -0400) | ||
committer | John Dowdal <jdowdal@ti.com> | |
Thu, 15 Aug 2013 19:10:32 +0000 (15:10 -0400) | ||
commit | 10549d9e65d6a5809edcfbe7d97e98b9bd6c7ab3 | |
tree | eb56a780d0104fcd1ad8fce235bf0633a8d1af70 | tree | snapshot (tar.xz tar.gz zip) |
parent | 3649755b7033b1c4c4b249058a7029497c9ba43a | commit | diff |
parent | eb4792355373c0aeccaf7418f7be3d8fd8ee6553 | commit | diff |
Merge 2.0.0.6
Conflicts:
device/k2h/global-resource-list-arm-dsp.c
device/k2h/global-resource-list-arm-dsp.dtb
device/k2h/global-resource-list-arm-dsp.dts
device/k2h/global-resource-list.c
device/k2h/global-resource-list.dtb
device/k2h/global-resource-list.dts
device/k2h/policy_dsp-only.c
device/k2h/policy_dsp-only.dtb
device/k2h/policy_dsp-only.dts
device/k2h/policy_dsp_arm.c
device/k2h/policy_dsp_arm.dtb
device/k2h/policy_dsp_arm.dts
device/k2k/global-resource-list-arm-dsp.c
device/k2k/global-resource-list-arm-dsp.dtb
device/k2k/global-resource-list-arm-dsp.dts
device/k2k/global-resource-list.c
device/k2k/global-resource-list.dtb
device/k2k/global-resource-list.dts
device/k2k/policy_dsp-only.c
device/k2k/policy_dsp-only.dtb
device/k2k/policy_dsp-only.dts
device/k2k/policy_dsp_arm.c
device/k2k/policy_dsp_arm.dtb
device/k2k/policy_dsp_arm.dts
docs/ReleaseNotes_RM.doc
docs/ReleaseNotes_RM.pdf
package.xdc
setupenv.bat
Conflicts:
device/k2h/global-resource-list-arm-dsp.c
device/k2h/global-resource-list-arm-dsp.dtb
device/k2h/global-resource-list-arm-dsp.dts
device/k2h/global-resource-list.c
device/k2h/global-resource-list.dtb
device/k2h/global-resource-list.dts
device/k2h/policy_dsp-only.c
device/k2h/policy_dsp-only.dtb
device/k2h/policy_dsp-only.dts
device/k2h/policy_dsp_arm.c
device/k2h/policy_dsp_arm.dtb
device/k2h/policy_dsp_arm.dts
device/k2k/global-resource-list-arm-dsp.c
device/k2k/global-resource-list-arm-dsp.dtb
device/k2k/global-resource-list-arm-dsp.dts
device/k2k/global-resource-list.c
device/k2k/global-resource-list.dtb
device/k2k/global-resource-list.dts
device/k2k/policy_dsp-only.c
device/k2k/policy_dsp-only.dtb
device/k2k/policy_dsp-only.dts
device/k2k/policy_dsp_arm.c
device/k2k/policy_dsp_arm.dtb
device/k2k/policy_dsp_arm.dts
docs/ReleaseNotes_RM.doc
docs/ReleaseNotes_RM.pdf
package.xdc
setupenv.bat
29 files changed: