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
..
dmabounce.c
gic.c
icst.c
it8152.c
Kconfig
locomo.c
Makefile
pl330.c
sa1111.c
scoop.c
sharpsl_param.c
time-acorn.c
timer-sp.c
uengine.c
via82c505.c
vic.c	ARM: 7236/1: vic: always use simple ops	2012-01-03 15:17:29 +00:00