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-08 10:30:40 +00:00
2010-12-19 12:56:46 -05:00
2011-07-12 11:19:29 -05:00
2011-02-02 21:23:26 +00:00
2011-12-06 11:15:25 +00:00