Olof Johansson ed0a0ed0a4 Merge branch 'next/cleanup' into HEAD ... Conflicts: drivers/staging/tidspbridge/core/wdt.c drivers/usb/host/Kconfig drivers/w1/masters/omap_hdq.c		2012-10-01 14:15:02 -07:00
..
include/mach	ARM: nomadik: use __iomem pointers for MMIO	2012-09-19 15:19:15 +02:00
board-nhk8815.c	ARM: nomadik: remove NAND_NO_READRDY use	2012-09-28 22:13:02 +02:00
cpu-8815.c	ARM: nomadik: convert to generic clock	2012-06-10 18:41:40 +02:00
cpu-8815.h	ARM: restart: nomadik: use new restart hook	2012-01-05 12:57:16 +00:00
i2c-8815nhk.c	ARM: nomadik: register all three I2C busses	2012-06-10 18:41:48 +02:00
Kconfig	ARM: nomadik: enable PINCTRL_NOMADIK where needed	2012-05-15 14:42:57 +02:00
Makefile	ARM: nomadik: convert to generic clock	2012-06-10 18:41:40 +02:00
Makefile.boot	ARM: 7022/1: allow to detect conflicting zreladdrs	2011-10-17 09:12:40 +01:00