442a33ebce
There is no reason to keep the clksrc cleanups separate from the other cleanups, and this resolves some merge conflicts. Conflicts: arch/arm/mach-spear/spear13xx.c drivers/irqchip/Makefile |
||
|---|---|---|
| .. | ||
| atmel_lcdc.h | ||
| aty128.h | ||
| auo_k190xfb.h | ||
| broadsheetfb.h | ||
| cirrus.h | ||
| cvisionppc.h | ||
| da8xx-fb.h | ||
| display_timing.h | ||
| edid.h | ||
| exynos_dp.h | ||
| exynos_mipi_dsim.h | ||
| gbe.h | ||
| hecubafb.h | ||
| iga.h | ||
| ili9320.h | ||
| Kbuild | ||
| kyro.h | ||
| mach64.h | ||
| maxinefb.h | ||
| mbxfb.h | ||
| metronomefb.h | ||
| mipi_display.h | ||
| mmp_disp.h | ||
| neomagic.h | ||
| newport.h | ||
| of_display_timing.h | ||
| of_videomode.h | ||
| omap-panel-data.h | ||
| omapdss.h | ||
| omapvrfb.h | ||
| permedia2.h | ||
| platform_lcd.h | ||
| pm3fb.h | ||
| pmag-ba-fb.h | ||
| pmagb-b-fb.h | ||
| pxa168fb.h | ||
| radeon.h | ||
| s1d13xxxfb.h | ||
| sa1100fb.h | ||
| samsung_fimd.h | ||
| sgivw.h | ||
| sh_mipi_dsi.h | ||
| sh_mobile_hdmi.h | ||
| sh_mobile_lcdc.h | ||
| sh_mobile_meram.h | ||
| sisfb.h | ||
| sstfb.h | ||
| tdfx.h | ||
| tgafb.h | ||
| trident.h | ||
| udlfb.h | ||
| uvesafb.h | ||
| vga.h | ||
| videomode.h | ||
| w100fb.h | ||