switch kernel for now
Reorganize device tree

Conflicts:
	device.mk