Commits

Merge branch 'for-rmk/samsung5' of git://git.fluff.org/bjdooks/linux into devel-stable Conflicts: arch/arm/Kconfig arch/arm/Makefile
Merge branch 'for-rmk/samsung5' of git://git.fluff.org/bjdooks/linux into devel-stable Conflicts: arch/arm/Kconfig arch/arm/Makefile