- Alan Cox: camera conversion missed parts
  - Neil Brown: md graceful alloc failure
  - Andrea Arkangeli: more alpha fixups, bounce buffer deadlock avoidance
  - Adam Fritzler: tms380tr driver update
  - Al Viro: VFS layer cleanups

  - Johannes Erdfelt: OHCI hash-chain corruption fix, USB updates
  - Richard Henderson, Ivan Kokshaysky: alpha PCI iommu fixes
  - Tim Waugh: parport changelogs and printk levels
  - Andrew Morton: vmalloc off-by-one (overly sensitive) test
  - Al Viro: VFS layer cleanups
  - Cort Dougan: PPC updates (big bootloader re-org)
  - Alan Cox: more merges, remove phillips camera conversion code
  - Andrea Arkangeli: alpha fixups
  - OGAWA Hirofumi: big-sector support with FAT
  - Neil Brown: more md fixes

  - Al Viro: fs cleanups
  - David Miller: sparc semaphores
  - Christoph Hellwig: VxFS update
  - Asit Mallick: set machine check bit with set_in_cr4
  - Richard Henderson: fix alpha pci_controller_num(), sg_fill, SRM poweroff.
  - Johannes Erdfelt: USB updates
  - Cort Dougan: bitkeeper Id's on the ppc side
  - Matt Chapman: NFS file locking SMP lock fix
  - Alan Cox: further merging

  - Russell King: ARM updates
  - Al Viro: more init cleanups
  - Cort Dougan: more PPC updates
  - David Miller: cleanups, pci mmap updates
  - Neil Brown: raid resync by sector
  - Alan Cox: more merging with -ac
  - Johannes Erdfelt: USB updates
  - Kai Germaschewski: ISDN updates
  - Tobias Ringstrom: dmfe.c network driver update
  - Trond Myklebust: NFS client updates and cleanups

  - Al Viro: sanity-check user arguments, zero-terminated strings etc.
  - Urban Widmark: smbfs update (server/client cache coherency etc)
  - Rik van Riel, Marcelo Tosatti: VM updates
  - Cort Dougan: PPC updates
  - Neil Brown: raid1/5 failed drive fixups, NULL ptr checking, md error cleanup
  - Neil Brown: knfsd fix for 64-bit architectures, and filehandle resolveir
  - Ken Brownfield: workaround for menuconfig CPU selection glitch
  - David Miller: sparc64 MM setup fix, arpfilter forward port
  - Keith Owens: Remove obsolete IPv6 provider based addressing
  - Jari Ruusu: block_write error case cleanup fix
  - Jeff Garzik: netdriver update

  - David Miller: network syncup (better TCP page fault handling by Andrea etc)
  - Tim Hockin: moxa driver fixes
  - Alexander Viro: clean up process reaping procedures, make /proc use
  the proper fields to notice that the process is gone, gone, gone.
  - Justin Gibbs: aic7xxx driver update to 6.1.13.
  - me: fix PCI allocation so that it doesn't stomp on unknown memory
  - Jeff Garzik: 8139too net drvr fix
  - Nigel Gamble: merge page fault interrupt gate from preemtible kernel.
  Fixes problem noticed by Brian Gerst.
  - Jean Tourrilhes: Orinoco / Airport support diff. Mucho cleanups.

  - Al Viro: clean up driver "invalidate_device()" mess
  - Andries Brouwer: make sd.c work with USB Dane-Elec CompactFlash Card
  Reader
  - me: fix nasty lazy kernel page table update problem
  - me: undo fork changes. Too many user-level bugs and unresolved issues.
  - Peter Anvin: iso9660 cleanups
  - Alan Cox: big merge
  - Johannes Erdfelt: UHCI pci DMA setup fix

  - Andrea Arkangeli: raw-io fixes
  - Johannes Erdfelt: USB updates
  - reiserfs update
  - Al Viro: fsync/umount race fix
  - Rusty Russell: netfilter sync

  - Al Viro: fix d_flags race between low-level fs and VFS layer.
  - David Miller: sparc updates
  - S390 update

  - Johannes Erdfelt: USB updates
  - David Howells: more rw-sem stuff
  - David Miller: network callback cleanups and fixes
  - Jan Harkes: make Coda use the proper VFS layer interfaces, so that it can use
  "non-traditional-unix" filesystems without inode numbers for backing store.

  - Chris Mason: daemonize reiserfs commit thread
  - Alan Cox: syncup (AFFS might even work, and official VIA workarounds)
  - Jeff Garzik: network driver updates
  - Paul Mackerras: PPP update
  - David Howells: more rw-sem cleanups, updates. Slowly getting somewhere.

  - Mike Phillips: olympic driver update
  - Alan Cox: continued resyncing (lots of small stuff, big NTFS merge from Anton)
  - Martin Dalecki: cleanup (remove unused and unnecessary get_hardblocksize)
  - Chris Mason: fix potential reiserfs journal overflow
  - Jeff Garzik: network driver updates
  - David Miller: sparc fixes, some network cleanups

  - David Miller: sparc rw semaphores moved over
  - Alan Cox: yet more resyncs
  - NIIBE Yutaka: Super-H driver update
  - David Howells: more rw-sem cleanups, updates
  - USB updates
  - Al Viro: filesystem init cleanup

  - Hui-Fen Hsu: sis900 driver update
  - NIIBE Yutaka: Super-H update
  - Alan Cox: more resyncs (ARM down, but more to go)
  - David Miller: network zerocopy, Sparc sync, qlogic,FC fix, etc.
  - David Miller/me: get rid of various drivers hacks to do mmap
  alignment behind the back of the VM layer. Create a real
  protocol for it.

  - Ingo Molnar/Al Viro: don't use bforget() on ext2 (and minix) metadata
  where we may not be the only owner of the buffer! FS corruption.
  - Andi Kleen: IPv6 packet re-assembly fix.
  - David Howells: fix up rwsem implementation
  - Alan Cox: more merging (S/390 down, ARM to go).
  - Jens Axboe: LVM and loop fixes

  - Bob Tracy: Cyrix MTRR setup fix (don't make it twice as big as asked
  for)
  - Trond Myklebust: rpciod needs to be PF_MEMALLOC to avoid deadlocks on
  memory allocation when writing out NFS data under low memory conditions.
  Fix up BKL and RPC interactions.
  - Jeff Garzik: tulip network driver update
  - fix truncate to call down to the filesystem with the kernel lock.
  - David Mosberger: ia64 update
  - David Mosberger: simplify ELF program header generation.
  - Alan Cox: merge from -ac series
  - Jeff Garzik: make serial.c recognize modem devices properly

  - Kai Germaschewski: Makefile dependency fixes. ISDN update
  - Chris Mason: another reiserfs tail writing fix
  - unify pte/pmd allocation
  - undo some VIA PCI fixups - conflicting behaviour

  - Paul Mackerras: PPC update for thread-safe page table handling
  - Ingo Molnar: x86 PAE update for thread-safe page table handling
  - Jeff Garzik: network driver updates, i810 rng driver, and
  "alloc_etherdev()" network driver insert race condition fix.
  - David Miller: UltraSparcIII update, network locking fixes
  - Al Viro: fix fs counts on mount failure

  - more bugs found by the automatic stanford checker, yay!
  - Andrew Morton: fix SAK locking bugs by moving it into a process context
  - Johannes Erdfelt: USB updates
  - Jeff Garzik: merge Hermes driver by David Gibson
  - Jens Axboe: cdrom merges, ll_rw_blk proper accounting

  - Jeff Garzik: network driver merge
  - Andrew Morton: fix missed page_table_lock unlock
  - David Miller: Qlogic,FC bufix, page allocation order problem.

  - Rik van Riel and others: mm rw-semaphore (ps/top ok when swapping)
  - IDE: 256 sectors at a time is legal, but apparently confuses some
  drives. Max out at 255 sectors instead.
  - Petko Manolov: USB pegasus driver update
  - make the boottime memory map printout at least almost readable.
  - USB driver updates
  - pte_alloc()/pmd_alloc() need page_table_lock.

  - Petr Vandrovec, Al Viro: dentry revalidation fixes
  - Stephen Tweedie / Manfred Spraul: kswapd and ptrace race
  - Neil Brown: nfsd/rpc/raid cleanups and fixes

  - Alan Cox: continued merging
  - Urban Widmark: smbfs fix (d_add on already hashed dentry - no-no).
  - Andrew Morton: 3c59x update
  - Jeff Garzik: network driver cleanups and fixes
  - Gérard Roudier: sym-ncr drivers update
  - Jens Axboe: more loop cleanups and fixes
  - David Miller: sparc update, some networking fixes

  - Jens Axboe: fix loop device deadlocks
  - Greg KH: USB updates
  - Alan Cox: continued merging
  - Tim Waugh: parport and documentation updates
  - Cort Dougan: PowerPC merge
  - Jeff Garzik: network driver updates
  - Justin Gibbs: new and much improved aic7xxx driver 6.1.5

  - Chris Mason: reiserfs, another null bytes bug
  - Andrea Arkangeli: make SMP Athlon build
  - Alexander Zarochentcev: reiserfs directory fsync SMP locking fix
  - Jeff Garzik: PCI network driver updates
  - Alan Cox: continue merging
  - Ingo Molnar: fix RAID AUTORUN ioctl, scheduling improvements

  - sync up more with Alan
  - Urban Widmark: smbfs and HIGHMEM fix
  - Chris Mason: reiserfs tail unpacking fix ("null bytes in reiserfs files")
  - Adan Richter: new cpia usb ID
  - Hugh Dickins: misc small sysv ipc fixes
  - Andries Brouwer: remove overly restrictive sector size check for
  SCSI cd-roms

  - big S/390x 64-bit merge
  - typos and license name fixes. doc updates.
  - more include file cleanups (phase out "malloc.h")
  - even more elevator corner cases.. When not merging, find the best insertion point.
  - pmac ide update
  - network fixes (netif_wake_queue on tx timeout)
  - USB printer select() fix
  - NFS client missed initialization, deamon fixed client address check

  - Jens: better ordering of requests when unable to merge
  - Neil Brown: make md work as a module again (we cannot autodetect
  in modules, not enough background information)
  - Neil Brown: raid5 SMP locking cleanups
  - Neil Brown: nfsd: handle Irix NFS clients named pipe behavior and
  dentry leak fix
  - maestro3 shutdown fix
  - fix dcache hash calculation that could cause bad hashes under certain
  circumstances (Dean Gaudet)
  - David Miller: networking and sparc updates
  - Jeff Garzik: include file cleanups
  - Andy Grover: ACPI update
  - Coda-fs error return fixes
  - rth: alpha Jensen update

  - driver sync up with Alan
  - Andrew Morton: wakeup cleanup and race fix
  - Paul Mackerras: macintosh driver updates.
  - don't trust "page_count()" on reserved pages!
  - Russell King: fix serious IDE multimode write bug!
  - me, Jens, others: fix elevator problem
  - ARM, MIPS and cris architecture updates
  - alpha updates: better page clear/copy, avoid kernel lock in execve
  - USB and firewire updates
  - ISDN updates
  - Irda updates

  - XMM: don't allow illegal mxcsr values
  - ACPI: handle non-existent battery strings gracefully
  - Compaq Smart Array driver update
  - Kanoj Sarcar: serial console hardware flow control support
  - ide-cs: revert toc-valid cache checking in 2.4.1
  - Vojtech Pavlik: update via82cxxx driver to handle the vt82c686
  - raid5 graceful failure handling fix
  - ne2k-pci: enable device before asking the irq number
  - sis900 driver update
  - riva FB driver update
  - fix silly inode hashing pessimization
  - add SO_ACCEPTCONN for SuS
  - remove modinfo hack workaround, all newer modutils do it correctly
  - datagram socket shutdown fix
  - mark process as running when it takes a page-fault

  - Al Viro: core file hardlink attack avoidance fix

  - Get non-cpuid Cyrix probing right (it's not a NexGen)
  - Jens Axboe: cdrom tray status and queing cleanups
  - AGP GART: don't disable VIA, and allow i815 with external AGP
  - Coda: use iget4() in order to have big inode numbers without clashes.
  - Fix UDF writepage() page locking
  - NIIBE Yutaka: SuperH update
  - Martin Diehl and others: SiS pirq routing fixes
  - Andy Grover: ACPI update
  - Andrea Arkangeli: LVM update
  - Ingo Molnar: RAID cleanups
  - David Miller: sparc and networking updates
  - Make NFS really be able to handle large files

  - Trond Myklebust: NFS/RPC client SMP fixes
  - rth: alpha pyxis and cabriolet fixes
  - remove broken sys_wait4() declarations
  - disable radeon debugging code
  - VIA IDE driver should not enable autodma unless asked for
  - Andrey Savochkin: eepro100 update. Should fix the resource timing problems.
  - Jeff Garzik: via82cxxx_audio update
  - YMF7xx PCI audio update: get rid of old broken driver, make new
  driver handle legacy control too.
  - fix missed wakeup on block device request list
  - hpt366 controller doesn't play nice with some IBM harddisks
  - remove inode pages from the page cache only after having removed them
  from the page tables.
  - shared memory out-of-swap writepage() fixup (no more magic return)

  - got a few too-new R128 #defines in the Radeon merge. Fix.
  - tulip driver update from Jeff Garzik
  - more cpq and DAC elevator fixes from Jens. Looks good.
  - Petr Vandrovec: nicer ncpfs behaviour
  - Andy Grover: APCI update
  - Cort Dougan: PPC update
  - David Miller: sparc updates
  - David Miller: networking updates
  - Neil Brown: RAID5 fixes

  - cpq array driver elevator fixes
  - merge radeon driver from X CVS tree
  - ispnp cleanups
  - emu10k unlock on error fixes
  - hpfs doesn't allow truncate to larger

  - USB hotplug updates/fixes
  - boots on real i386 machines
  - fix n_tty "canon" mode SMP race
  - FAT fat_cache SMP race fix

  - fix inode state comparison bug from ReiserFS merge

  - blk-14 from Jens Axboe

  - ppp UP deadlock attack fix

  - ReiserFS merge
  - fix DRM R128/AGP dependency