alx: mostly compile fixes#2

hauke wants to merge 3 commits intoerikarn:mastererikarn/alx:masterfrom

hauke:kernel-3.10-fixeshauke/alx:kernel-3.10-fixesCopy head branch name to clipboard