changed var name to be more consistent
enable highmem64g and pae in linux kernel
Merge branch 'testing'