- Merge with Alan
  - Trond Myklebust: NFS fixes - kmap and root inode special case
  - Al Viro: more superblock cleanups, inode leak in rd.c, minix
  directories in page cache
  - Paul Mackerras: clean up rubbish from sl82c105.c
  - Neil Brown: md/raid cleanups, NFS filehandles
  - Johannes Erdfelt: USB update (usb-2.0 support, visor fix, Clie fix,
  pl2303 driver update)
  - David Miller: sparc and net update
  - Eric Biederman: simplify and correct bootdata allocation - don't
  overwrite ramdisks
  - Tim Waugh: support multiple SuperIO devices, parport doc updates

  - Hugh Dickins: swapoff cleanups and speedups
  - Matthew Dharm: USB storage update
  - Keith Owens: Makefile fixes
  - Tom Rini: MPC8xx build fix
  - Nikita Danilov: reiserfs update
  - Jakub Jelinek: ELF loader fix for ET_DYN
  - Andrew Morton: reparent_to_init() for kernel threads
  - Christoph Hellwig: VxFS and SysV updates, vfs_permission fix

  - Johannes Erdfelt, Oliver Neukum: USB printer driver race fix
  - John Byrne: fix stupid i386-SMP irq stack layout bug
  - Andreas Bombe, me: yenta IO window fix
  - Neil Brown: raid1 buffer state fix
  - David Miller, Paul Mackerras: fix up sparc and ppc respectively for kmap/kbd_rate
  - Matija Nalis: umsdos fixes, and make it possible to boot up with umsdos
  - Francois Romieu: fix bugs in dscc4 driver
  - Andy Grover: new PCI config space access functions (eventually for ACPI)
  - Albert Cranford: fix incorrect e2fsprog data from ver_linux script
  - Dave Jones: re-sync x86 setup code, fix macsonic kmalloc use
  - Johannes Erdfelt: remove obsolete plusb USB driver
  - Andries Brouwer: fix USB compact flash version info, add blksize ioctls

  - Al Viro: block device cleanups
  - Marcelo Tosatti: make bounce buffer allocations more robust (it's ok
  for them to do IO, just not cause recursive bounce IO. So allow them)
  - Anton Altaparmakov: NTFS update (1.1.17)
  - Paul Mackerras: PPC update (big re-org)
  - Petko Manolov: USB pegasus driver fixes
  - David Miller: networking and sparc updates
  - Trond Myklebust: Export atomic_dec_and_lock
  - OGAWA Hirofumi: find and fix umsdos "filldir" users that were broken
  by the 64-bit-cleanups. Fix msdos warnings.
  - Al Viro: superblock handling cleanups and race fixes
  - Johannes Erdfelt++: USB updates

  - Jeff Hartmann: DRM AGP/alpha cleanups
  - Ben LaHaise: highmem user pagecopy/clear optimization
  - Vojtech Pavlik: VIA IDE driver update
  - Herbert Xu: make cramfs work with HIGHMEM pages
  - David Fennell: awe32 ram size detection improvement
  - Istvan Varadi: umsdos EMD filename bug fix
  - Keith Owens: make min/max work for pointers too
  - Jan Kara: quota initialization fix
  - Brad Hards: Kaweth USB driver update (enable, and fix endianness)
  - Ralf Baechle: MIPS updates
  - David Gibson: airport driver update
  - Rogier Wolff: firestream ATM driver multi-phy support
  - Daniel Phillips: swap read page referenced set - avoid swap thrashing

  - David Miller: sparc updates, FAT fs fixes, btaudio build fix
  - David Gibson: Orinoco driver update
  - Kevin Fleming: more disks the HPT controller doesn't like
  - David Miller: "min()/max()" cleanups. Understands signs and sizes.
  - Ben LaHaise: make vma merging more generous, help Mozilla /proc/<>/maps
  - Jens Axboe: CD updates
  - Trond Myklebust: save away NFS credentials in inode, so that mmap can
  writeout.
  - Mark Hemment: HIGHMEM ops cleanups
  - Jes Sorensen: use "unsigned long" for flags in various drivers

  - Tim Hockin: NatSemi ethernet update
  - Kurt Garloff: make PS/2 mouse reconnect adjustable like 2.2.x
  - Daniel Phillips: unlazy use-once
  - David Miller: undo poll() limit braindamage
  - me: make return value from do_try_to_free_pages() meaningful

  - Patrick Mochel: fix PCI:PCI bridge 64-bit memory type detection
  - me: more forgotten nfsd off_t -> loff_t
  - Alan Cox: ide driver merge
  - Eric Lammerts, Rik van Riel: when oom, kill all threads.
  - Ben LaHaise: use down_read, not down_write() in map_user_kiobuf.
  We don't change the mappings, we just read them.
  - Kai Germaschewski: ISDN updates
  - Roland Fehrenbacher: sparse lun check
  - Tim Waugh: handle awkward Titan parallel/serial port cards
  - Stephen Rothwell: APM updates
  - Anton Altaparmakov: NTFS updates

  - me: fix forgotten nfsd usage of filldir off_t -> loff_t change
  - Alan Cox: more driver merges

  - Rui Sousa: emu10k1 module fixes, remove joystick part.
  - Alan Cox: driver merges
  - Andrea Arkangeli: alpha updates
  - David Woodhouse: up_and_exit -> complete_and_exit
  - David Miller: sparc and network update
  - Andrew Morton: update 3c59x driver
  - Neil Brown: NFS export VFAT, knfsd cleanups, raid fixes
  - Ben Collins: ieee1394 updates
  - Paul Mackerras: PPC update
  - me: make sure we don't lose position bits in "filldir()"

  - Rik van Riel: free up swap cache on swapin when swap is full..
  - Robert Love: merge emu10k sound driver.  This one is better ("Yeah,
  you actually get sound out of it")
  - Jeremy Linton: swapin/swapoff race condition fix

  - Jeff Hartmann: serverworks AGP gart unload memory leak fix
  - Marcelo Tosatti: make zone_inactive_shortage() return how big the shortage is.
  - Hugh Dickins: tidy up age_page_down()
  - Al Viro: super block handling cleanups

  - me: sane and nice VM balancing
  - Jeff Hartmann: upgrade DRM to XF86 4.1.x, drop support for 4.0.x

  - me: better dirty balancing
  - David Miller: sparc and network updates

  - Alan Cox: more merging
  - L.C. Chang: new SiS IDE PCI id's.
  - Maciej Rozycki: make MP table parsing more anal. Should fix broken P4 MP tables.
  - Leonard Zubkoff: merge DAC960 completion changes
  - Christoph Rohland: saner tmpfs mount-time limit behaviour (and remount)
  - me: buffer.c logic update - faster and hopefully livelock-free

  - David Mosberger: IA64 update
  - Geert Uytterhoeven: cleanup, new atyfb
  - Marcelo Tosatti: zone aging fixes
  - me, others: limit IO requests sanely

  - Ben Collins: 1394 updates
  - Matthew Dharm: USB storage update
  - Ion Badulescu: starfire driver update
  - VM aging cleanups

  - Kai Germaschewski: ISDN updates
  - David Miller: sparc and network updates
  - Andrea Arcangeli, Maksim Krasnyanskiy: tasklet fixes
  - Stelian Pop: Motion Eye camera driver update
  - Jens Axboe: DAC960 update

  - Anton Altaparmakov: NTFS error checking
  - Johannes Erdfelt: USB updates
  - OGAWA Hirofumi: FAT update
  - Alan Cox: driver + s390 update merge
  - Richard Henderson: fix alpha sigsuspend error return value
  - Marcelo Tosatti: per-zone VM shortage
  - Daniel Phillips: generic use-once optimization instead of drop-behind
  - Bjorn Wesen: Cris architecture update
  - Anton Altaparmakov: support for Windows Dynamic Disks
  - James Washer: LDT loading SMP bug fix

  - me: fix ptrace and /proc issues with new core-dump permissions
  - numerous: IDE tape driver update for completion handlers
  - Ben Collins: ieee1394 GUID cleanups
  - Jacek Stepniewski: nasty deadlock in rename()

  - Dan Quinlan: cramfs update
  - Ben Collins: IEEE 1394 update
  - David Miller: network update (pppoe, routing cache stats), sparc32 update
  - me: only dump core once per threaded app (first one wins)
  - me: use new completion handlers for block device requests (same race
  as with vfork, see -pre7)

  - Chris Mason: reiserfs update
  - Paul Mackerras: PPC updates (softirq)
  - Kai Germaschewski: ISDN updates
  - various: workaround for cpuid inline asm problem with egcs-2.91.66

  - Andreas Dilger: various ext2 cleanups
  - Richard Gooch: devfs update
  - Johannes Erdfelt: USB updates
  - Alan Cox: merges
  - David Miller: fix SMP pktsched bootup deadlock (CONFIG_NET_SCHED)
  - Roman Zippel: AFFS update
  - Anton Altaparmakov: NTFS update
  - me: fix races in vfork() (semaphores are not good completion handlers)
  - Jeff Garzik: net driver updates, sysvfs update

  - me: fix more buffer head SMP races (non-x86 only - weak memory ordering)
  - Andrea Arkangeli: some bh cleanups from the buffer race condition fix
  - Tim Waugh: parport drievr documentation, init sanity
  - Ion Badulescu: starfire net driver update
  - David Miller: sparc and networking updates
  - Ivan Kokshaysky: alpha version of the inlined rw-semaphores
  - NIIBE Yutaka: SuperH update

  - remember to bump the version string
  - Andrea Arkangeli: softirq cleanups and fixes, and everybody is happy
  again (ie I changed some details to make me happy ;)
  - Neil Brown: raid5 stall fix, nfsd filehandle sanity check fix

  - David Miller: sparc and networking updates
  - Al Viro: SysV FS add_link off-by-two bogosity.
  - Jeff Garzik: merge D-Link DL2k GigE driver, other network driver cleanups
  - Kai Germaschewski: ISDN update
  - Alan Cox: more merging (MPT fusion core)
  - Johannes Erdfelt: USB updates
  - Stas Sergeev: make sure we return out of vm86 mode when interrupts
  get re.enabled
  - Rusty Russell: netfilter fixes for ipt_unclean and ip_queue
  - me: initialize page->age when adding it to the swap cache
  - Paul Mackerras: PPC updates
  - some subtle fs/buffer.c race conditions (Andrew Morton, me)

  - merge with Alan (SCSI subsystem)
  - Jeff Garzik: make serial driver PCI hotplug-aware

  - merge with Alan (USB, zoran, sony motion-eye, rio, dmi-scan)

  - merge with Alan (irda, s390, mips64, chris, sk98lin, mips/mm)
  - rth: fix alpha RTC calibration
  - Paul Mackerras: fix PPC typo

  - misc mtd updates

  - make sure "sync()" doesn't effectively lock up the machine by
  overloading all the IO resources
  - fix up some network memory allocations that don't wan tto wait on IO.
  - merge with Alan (including MIPS update)
  - Jeff Garzik: network driver updates.
  - Al Viro: System V FS update (write capability, page cache, mondo cleanups)
  - Kai Germaschewski: ISDN cleanups, TURBOPAM driver by Stelian Pop
  - Ben Fennema: UDF update (time handling, i_blocks fix)
  - Neil Brown: md error handling improvements, knfsd file handle compatibility
  - Paul Mackerras: PPC update
  - Jakub Jelinek: fix up kernel linker scripts to accept .rodata better
  - Patrick Mochel: fix PME handling in pci_enable_wake()
  - Chris Mason: reiserfs PF_MEMALLOC handling

  - me: fix GFB_BUFFER thinkos. Make buffer syncing more efficient.
  Make sure we don't leave buffers on the LOCKED list forever
  - David Miller: networking and sparc updates

  - Patrick Mochel: PCI documentation, and PM cleanups
  - mtd: export nand ECC functions
  - Jes Sorenson: acenic driver update
  - Alan Cox: fix vxfs merge boo-boo
  - me: undo page_launder() LRU changes, they have nasty side effects
  - wanrouter: fix error code

  - Jeff Garzik: net driver updates, PCI PM induced cleanups
  - Me: do ACPI first, so that it doesn't mess up existing device driver
  configurations.  Notably it used to completely destroy PCMCIA on some
  Sony VAIOs.
  - Paul Mackerras: powermac drivers and MAINTAINERS update
  - NIIBE Yutaka: SuperH update
  - Johannes Erdfelt: USB driver updates
  - Russell King: ARM update
  - Alan Cox: merging, merging, merging

  - Johannes Erdfelt: USB update (bluetooth and serial)
  - Andrew Grover: ACPI update for _real_ this time.
  - Neil Brown: md update
  - Keith Owens: kbuild script fix, do_softirq versioning fix
  - David Miller: sparc and portability updates

  - Chris Mason: ReiserFS pre-allocation locking bugfix
  - David Miller: fix bitops users (requires "long" alignment)
  - Andrey Savochkin: file locking failure case SMP lock fix
  - Urban Widmark: smbfs update (avoid unnecessary flushing, make NetApp
  work)
  - Andrew Grover: ACPI update
  - Jeff Garzik: network driver updates
  - Maciej Rozycki: IO-APIC level trigger problem workaround
  - Rusty Russell: ipt_unclean fix
  - Richard Gooch: devfs update

  - remember to increment the version number
  - Chris Mason: reiserfs mark_journal_new and bh leak fix
  - Richard Gooch: devfs update
  - Alexander Viro: further FS cleanup (superblock list)
  - David Woodhouse: MTD update
  - Kai Germaschewski: ISDN update (stanford checker fixes etc)
  - Rich Baum: gcc-3.0 warning fixes
  - Jeff Garzik: network driver updates
  - Geert Uytterhoeven: m68k fbdev logo merge glitch fix
  - Andrea Arcangeli: fix signal return path
  - David Miller: Sparc updates
  - Johannes Erdfelt: USB update
  - Carsten Otte, Andries Brouwer: don't clear blk_size unconditionally
  on partition check
  - Martin Frey: alpha Sable irq fix
  - Paul Mackerras: PPC softirq update
  - Patrick Mochel: PCI power management infrastructure
  - Robert Siemer: miroSOUND driver update
  - Neil Brown: knfsd updates, including ability to export ReiserFS filesystems
  - Trond Myklebust: NFS readdir fixup, don't update atime on client
  - Andrew Morton: truncate_inode_pages speedup
  - Paul Menage: make inode quota count all inodes..

  - Takanori Kawano: brlock indexing bugfix
  - Ingo Molnar, Jeff Garzik: softirq updates and fixes
  - Al Viro: rampage of superblock cleanups.
  - Jean Tourrilhes: Orinoco driver update v6, IrNET update
  - Trond Myklebust: NFS brown-paper-bag thing
  - Tim Waugh: parport update
  - David Miller: networking and sparc updates
  - Jes Sorensen: m68k update.
  - Ben Fennema: UDF update
  - Geert Uytterhoeven: fbdev logo updates
  - Willem Riede: osst driver updates
  - Paul Mackerras: PPC update
  - Marcelo Tosatti: unlazy swap cache
  - Mikulas Patocka: hpfs update

  - Andreas Dilger: make ext2fs react more gracefully to inode disk
  errors
  - Andrea Arkangeli: fix up alpha compile issues
  - Ingo Molnar: io-apic MP table parsing update and softirq latency
  update
  - Johannes Erdfelt: USB updates
  - Richard Henderson: alpha rawhide irq handling fixes
  - Marcelo, Andrea, Rik: more VM issues
  - Al Viro: fix various ext2 directory handling checks by biting the
  bullet and using the page cache.

  - 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