Russell King 2e0e943436 Merge branch 'devel-stable' into for-linus
Conflicts:
	arch/arm/kernel/setup.c
	arch/arm/mach-shmobile/board-kota2.c
2012-01-05 13:24:33 +00:00
..
2011-03-29 14:48:19 +02:00
2011-07-25 20:57:14 -07:00
2011-03-29 14:48:19 +02:00
2011-03-31 11:26:23 -03:00
2011-03-29 14:48:19 +02:00