Changes for 3.0 kernel

Change-Id: Ifa72267189324728d708d504f2e97ad07c39d647