commit c537155648b06bc715ead9db338d2b1da8d870b6 Merge: bec1545 e00b60b Author: Jiri Pirko <jiri at resnulli.us> Date: Thu Jan 17 15:57:26 2013 +0100 Merge commit 'e00b60bd2a2488fec2d3212150947d97d54cbe1e' into f17 ---