Merge shinybook.infradead.org:/home/dwmw2/bk/linus-2.5
David Woodhouse authored
into shinybook.infradead.org:/home/dwmw2/bk/85xx-2.6
35820ceb