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:33:32 +00:00
2011-01-06 22:33:32 +00:00
2010-12-18 21:02:14 +08:00
2010-12-18 21:02:14 +08:00
2010-12-18 21:02:14 +08:00
2011-01-06 22:33:32 +00:00
2010-12-20 23:07:42 +08:00
2010-12-18 21:02:14 +08:00
2010-12-18 21:02:14 +08:00
2010-12-18 21:02:15 +08:00
2011-01-06 22:33:32 +00:00
2009-06-03 14:06:13 -04:00