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
..
bus.h	ARM: amba: provide common initializers for static amba devices	2012-01-25 11:04:03 +00:00
clcd.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
kmi.h
mmci.h	mmc: mmci: add capabilities2 for MMC_CAP2	2012-01-11 23:58:41 -05:00
pl08x.h	dmaengine: move drivers to dma_transfer_direction	2011-10-27 20:53:43 +05:30
pl022.h	spi/pl022: add support for pm_runtime autosuspend	2011-12-01 17:16:08 +01:00
pl061.h	gpio: pl061: convert to use 0 for no irq	2012-01-04 10:10:19 -06:00
pl093.h	ARM: PL093: Header file for PL093 SSMC PrimeCell	2009-07-30 23:22:54 +01:00
pl330.h	DMA: PL330: Infer transfer direction from transfer request instead of platform data	2011-12-23 10:07:03 +09:00
serial.h	ARM: 7339/1: amba/serial.h: Include types.h for resolving dependency of type bool	2012-02-23 22:07:55 +00:00