More work on SAI
Merge branch 'jb-4.2.1' of git://github.com/stratosk/samsung-kernel-aries into jb-4.2.1