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-12-16 14:31:17 +08:00
2010-12-18 21:02:16 +08:00
2010-12-16 14:31:18 +08:00
2010-12-16 14:31:17 +08:00