summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/crm-regs-imx5.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-04-03 17:07:29 +0200
committerTakashi Iwai <tiwai@suse.de>2013-04-03 17:07:29 +0200
commitefc33ce197e4b6aaddf1eb2ba6293f51daf3c283 (patch)
tree9eaceed3c855d5cbc91c2fc247bdcceafbf28cdf /arch/arm/mach-imx/crm-regs-imx5.h
parent993884f6a26c6547fa3875f9d3fabdc4250d8da6 (diff)
parent690a863ff03d9a29ace2b752b8f802fba78a842f (diff)
Merge branch 'for-linus' into for-next
Back-merge for cleaning up usb-audio code the recent commit modified, and further UAC2 autoclock patches.
Diffstat (limited to 'arch/arm/mach-imx/crm-regs-imx5.h')
0 files changed, 0 insertions, 0 deletions