Apply patchset 2.6.29.6

Signed-off-by: e334 <e334cn@gmail.com>
misc stuff