sync with -stable, see http://lwn.net/Articles/381570/ for changes