Merge "New kernel and wifi driver:" into gingerbread