Merge branch 'encore-32-zOMG' of github.com:mrg666/nook_kernel into encore-32-zOMG