Russell King 404a02cbd2 Merge branch 'devel-stable' into devel ... Conflicts: arch/arm/mach-pxa/clock.c arch/arm/mach-pxa/clock.h		2011-01-06 22:33:32 +00:00
..
include/plat	nomadik-gpio: allow sleep mode dir/pull to differ from normal mode	2010-12-08 13:14:52 +01:00
gpio.c	nomadik-gpio: use dev name if no name is specified	2010-12-08 13:24:50 +01:00
Kconfig	ARM: nomadik: convert sched_clock() to use new infrastructure	2010-12-22 22:44:48 +00:00
Makefile	ARM: 5969/1: nomadik: move gpio to plat-nomadik	2010-03-19 18:29:31 +00:00
timer.c	ARM: nomadik: convert sched_clock() to use new infrastructure	2010-12-22 22:44:48 +00:00