kernel: sync with release 2013-05-21