Dave Jones: "Fix up some merge errors, scoop up another bunch of pending fixes
expected to hit Linus' tree soon, and drop some problem bits."
Patch is available from: http://www.codemonkey.org.uk/patches/2.5/patch-2.5.1-dj3.diff.bz2 On with the changelog.. Some of these fixes still haven't found their way back to Marcelo yet but should show up in 2.4.17-rc2 / 2.4.18pre1 with any luck. 2.5.1-dj3 o Drop Manfreds multithread coredump changes (Me) | They caused ltp waitpid05 regression on 2.5 | (Same patch is fine for 2.4) o Intermezzo compile fix. (Chris Wright) o Fix ymfpci & hisax merge errors. (Me) o Drop ad1848 sound driver changes in favour of 2.5 (Me) o Make hpfs work again. (Al Viro) o Alpha Jensen compile fixes. (Ronald Lembcke) o Make NCR5380 compile non modularly. (Erik Andersen)