You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Russell King 404a02cbd2 Merge branch 'devel-stable' into devel ... Conflicts: arch/arm/mach-pxa/clock.c arch/arm/mach-pxa/clock.h		14 years ago
..
include/plat	nomadik-gpio: allow sleep mode dir/pull to differ from normal mode	14 years ago
Kconfig	ARM: nomadik: convert sched_clock() to use new infrastructure	14 years ago
Makefile	…
gpio.c	nomadik-gpio: use dev name if no name is specified	14 years ago
timer.c	ARM: nomadik: convert sched_clock() to use new infrastructure	14 years ago