Conflicts: arch/arm/mach-lpc32xx/clock.c arch/arm/mach-pxa/pxa25x.c arch/arm/mach-pxa/pxa27x.c The conflicts with pxa are non-obvious, we have multiple branches adding and removing the same clock settings. According to Haojian Zhuang, removing the sa1100 rtc dummy clock is the correct fix here. Signed-off-by: Arnd Bergmann <arnd@arndb.de> |
||
---|---|---|
.. | ||
8xxx_gpio.txt | ||
fsl-imx-gpio.txt | ||
gpio_keys.txt | ||
gpio_nvidia.txt | ||
gpio-samsung.txt | ||
gpio.txt | ||
led.txt | ||
pl061-gpio.txt |