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-12-19 12:26:07 +01:00
2011-12-15 11:25:43 -07:00
2011-11-29 18:39:37 -05:00
2011-12-20 18:53:26 +01:00
2011-12-05 17:06:37 +01:00
2011-10-31 19:31:57 -04:00
2011-12-13 16:13:15 -08:00