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
..
2011-01-06 22:32:52 +00:00
2010-12-19 12:56:46 -05:00
2010-12-19 12:56:46 -05:00
2011-01-06 22:33:32 +00:00
2010-12-22 11:05:34 +00:00
2010-10-18 22:34:47 +01:00