Russell King 9a55d9752d Merge branch 'devel-stable' into for-linus ... Conflicts: arch/arm/Kconfig arch/arm/mach-ns9xxx/include/mach/uncompress.h		2011-05-23 19:28:04 +01:00
..
include/plat	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx	2011-03-22 17:53:13 -07:00
gpio.c	ARM: nmk: update GPIO chained IRQ handler to entry/exit functions	2011-05-11 16:04:15 +01:00
Kconfig	clocksource: convert ARM 32-bit down counting clocksources	2011-05-23 18:04:51 +01:00
Makefile	ARM: 5969/1: nomadik: move gpio to plat-nomadik	2010-03-19 18:29:31 +00:00
timer.c	clocksource: convert ARM 32-bit down counting clocksources	2011-05-23 18:04:51 +01:00