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
..
2010-10-27 18:03:07 -07:00
2010-03-07 22:17:37 +01:00
2010-10-29 00:29:32 +02:00
2009-07-12 12:22:34 -07:00
2010-10-29 00:29:51 +02:00