[+ indicates stuff that went to Marcelo, o stuff that has not,
 * indicates stuff that is merged in mainstream now, X stuff that proved
   bad and was dropped out]

Linux 2.4.19rc1-ac7
o       Merge more HPPA bits
o       tcp_diag alignment fixup                        (Richard Henderson)
        | Pending DaveM making a nicer fix Im sure
o       Hopefully fix the SMP APIC problems rc6         (James Cleverdon)
        gave some people
o       Fix incorrect __init in PCI core                (Takayoshi KOCHI)
        | Caused hotplug bugs
o       Update IBM PCI hotplug driver                   (Greg Kroah-Hartmann)
o       Add SCSI blacklist entries for Centristor       (Robert Sertic)
o       Update Documentation/sysctl/vm.txt              (Steven Cole)
o       Fix kdev_val macro                              (Steven Cole)
o       Allow a user to force dma 0 to be allowed       (Gerald Teschl)
        for ISAPnP [be nice to autodetect this ?]
o       Hopefully fix bogus config question bug         (me)
o       Fix hang on some boxes if you unload
        maestro audio then hit the volume buttons       (Samuel Thibault)
o       Fix aha152x scsi                                (Juergen Fischer)
o       Bluetooth pcmcia drivers                        (Marcel Holtmann)