Merge tag 'for-linus-20130509' of git://git.infradead.org/~dwmw2/random-2.6