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-31 11:26:23 -03:00
2010-06-15 13:19:43 -07:00
2011-02-28 12:40:17 -08:00
2011-02-28 12:40:17 -08:00
2011-02-28 12:40:17 -08:00
2011-02-28 12:40:17 -08:00
2010-06-07 16:16:33 -07:00
2011-02-28 12:40:05 -08:00
2011-03-29 14:47:58 +02:00
2011-02-28 12:40:05 -08:00
2011-02-28 12:40:05 -08:00
2011-03-29 14:47:58 +02:00
2010-11-16 12:23:56 -08:00
2010-05-12 09:14:41 -07:00