Initial merge with 3.4.67 kernel from Dr-Shadow