Resolves merge issues with: drivers/cpufreq/cpufreq.c Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: Ic2907cf71867dab7b8e1b5fcbd4c888fc01f8c22 |
||
|---|---|---|
| .. | ||
| coherent.c | ||
| contiguous.c | ||
| debug.c | ||
| direct.c | ||
| dummy.c | ||
| Kconfig | ||
| Makefile | ||
| mapping.c | ||
| pool.c | ||
| remap.c | ||
| swiotlb.c | ||
| virt.c | ||