Arnd Bergmann f907ab06bb Merge branch 'next/fixes-non-critical' into next/drivers ... 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>		2012-03-20 22:42:24 +00:00
..
8xxx_gpio.txt	dt: Move device tree documentation out of powerpc directory	2011-01-31 00:09:01 -07:00
fsl-imx-gpio.txt	gpio/mxc: add device tree probe support	2011-07-08 12:38:18 -06:00
gpio_keys.txt	Input: gpio_keys - fix two typos in devicetree documentation	2011-08-02 22:17:31 -07:00
gpio_nvidia.txt	gpio: tegra: Parameterize the number of banks	2012-02-06 18:25:00 -08:00
gpio-samsung.txt	gpio/samsung: Add device tree support for EXYNOS4	2011-12-23 10:06:54 +09:00
gpio.txt	gpio/dt: Refine GPIO device tree binding	2011-06-28 15:35:53 -06:00
led.txt	doc: dt: Fix broken reference in gpio-leds documentation	2012-02-27 10:28:04 -06:00
pl061-gpio.txt	devicetree: Add ARM pl061 gpio controller binding doc	2011-10-05 07:39:56 -05:00