SGI Modid: 2.5.x-xfs:slinx:134960a

SGI Modid: 2.5.x-xfs:slinx:134949a

SGI Modid: 2.5.x-xfs:slinx:134787a

SGI Modid: 2.5.x-xfs:slinx:134788a

SGI Modid: 2.5.x-xfs:slinx:134775a

SGI Modid: 2.5.x-xfs:slinx:134630a

SGI Modid: 2.5.x-xfs:slinx:134480a

SGI Modid: 2.5.x-xfs:slinx:134254a

SGI Modid: 2.5.x-xfs:slinx:134450a

into home.transmeta.com:/home/torvalds/v2.5/linux

into home.transmeta.com:/home/torvalds/v2.5/linux

* 5704-A0 chip-specific patch. fixes PXE issue.
* the existence of the mini ring is an urban legend.
  (no production board has it; it requires external SRAM)
* re-arrange driver-private struct to be cacheline-friendly.

(from lkml)

into tetrachloride.(none):/mnt/stuff/kernel/2.5/agpgart

- Finalized the interface by :

        * Having an epoll_event structure instead of using the pollfd
        * Adding a 64 bit opaque data member to the epoll_event structure
        * Removing the "fd" member from the epoll_event structure
        * Removing the "revents" member to leave space for a unique 32 bit
                "events" member

- Fixes the problem where, due the new callback'd wake_up() mechanism
        loops might be generated by bringing deadlock or stack blow ups.
        In fact a user could create a cycle by adding epoll fds inside
        other epoll fds. The patch solves the problem by either :

        * Moving the wake_up() call done on the poll wait queue head,
                outside the locked region
        * Implementing a new safe wake up function for the poll wait queue
                head

- Some variable renaming

- Changed __NR_sys_epoll_* to __NR_epoll_* ( Hanna Linder )

- Blocked the add operation of an epoll file descriptor inside itself

- Comments added/fixed

into home.transmeta.com:/home/torvalds/v2.5/linux

into maxwell.earthlink.net:/usr/src/fbdev-2.5

New NVIDIA and Radeon cards pci ids. Soon I will add support for these :-) Also a needed fix for fbcon.c. 

into maxwell.earthlink.net:/usr/src/linus-2.5

into kroah.com:/home/greg/linux/BK/gregkh-2.5

Here's a small patch for the file. The patch is against 2.5.50.

This patch makes ss->ep_int just like ep_in and ep_out for improved code
symmetry and readability.  It may (on some architectures) also shrink the
size of the per-device data structure.

Change interrupt used for CBI from periodic to one-shot.  This (a) reduces
consumed bandwidth, (b) makes the logic clearer, and (c) makes the abort
mechanism more uniform.

While in search of a different bug, I found this one
that got in with the recent 'async_next' patch.  The
schedule scan termination changed (had to), but it
wasn't quite correct.  Slower and/or misbehaving
devices might have wedged a CPU ... fix is simple,
only restart the scan when the list may have changed.

into maxwell.earthlink.net:/usr/src/fbdev-2.5

into maxwell.earthlink.net:/usr/src/linus-2.5

add_blkdev_randomness() is long gone, so remove stale declaration and
comments

into home.transmeta.com:/home/torvalds/v2.5/linux

into home.transmeta.com:/home/torvalds/v2.5/linux