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

..

asm

Merge branch 'devel-stable' into devel

2011-01-06 22:33:32 +00:00