based on a patch from OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>

That patch went into mainline by mistake - it was initial variant of a
fix for the problem with disabled P2P bridges. Which has already been
fixed properly in -test3.

into kroah.com:/home/greg/linux/BK/pci-2.6

It's not needed.

into home.osdl.org:/home/torvalds/v2.5/linux

This is a patch for the video4linux unified zoran driver that has been
in the kernel since 2.4.5 or so.

It fixes the compile issues in the current 2.6.0-test3 unified zoran
driver (current one doesn't compile at all), and also updates its
version to what we have in CVS.  This adds support for new cards (e.g.
LML33R10 from LinuxMediaLabs and DC30+ from Pinnacle), fixes bugs in
cards that were already supported and generally improves capture
reliability.  Changes per file (in detail) are given below. 

i2c-id.h:
  add some new IDs for new i2c drivers

pci_ids.h:
  add PCI IDs for each of the supported cards if it has any

saa7111.c, saa7110.c, adv7175.c, bt819.c, saa7185.c, bt856.c:
  update to whatever we've got in our CVS. For most, these are just
  "easiness" fixes that either add some better debug output, or that make
  maintainance for both 2.6.x and 2.4.x simpler for me. There's also some
  specific changes. E.g., in saa7110.c, we enable the VCR mode bits so we
  get a better image from VCR input. In all of them, we make debugging an
  insmod option rather than a compile-time option (this makes debugging
  for users a *lot* easier). Point is that I just want our latest CVS in
  here. Maintainance is going to be a personal horror-story if it's not.

vpx3220.c, saa7114.c, adv7170.c:
  new i2c ones (for respectively DC10/DC30, LML33R10 and again LML33R10)

zr36067.c:
  removed, the driver is now spread over multiple source files.

zoran*.[ch], zr36057.h
  spread-out source files. Also fixes lots of bugs, can't even start
  naming them all, you don't want that, neither do I. Just assume that it
  works better than it used to - it does.

  Nice things that aren't in the old driver: much more stable, supports
  DC30+, supports LML33R10, has proper locking/semaphores, supports
  multiple opens without races now, adapted to new i2c subsystem, v4l2
  support, Xv (hardware-scaled) overlay support, and a lot more.

  Oh, and this one actually compiles.

videocodec.[ch], zr360{16,50,60}.[ch]:
  new sublayer for the driver to unify how we handle the zr36060 chip
  (DC10(+)/LML33/LML33R10/Buz) and the zr36050/zr36016 (DC30(+)).

MAINTAINERS:
  add me as maintainer (I am).

Kconfig:
  add new cards, plus improve the descriptions.

Makefile:
  d'oh.

Zoran:
  documentation update.

Others:
  I don't think there are any.

Greg has gone over the i2c changes a long time ago, he agreed on all of
them. Gerd is supposed to take care of the v4l part, he has never
complained about any of them. Stability is good, we've fixed most issues
(there's still some out there, but nothing serious), lots better than in
the old driver. Also, the cards work much better than with the old
driver.

getting rid of the simple stuff that hides the serious things. 

This patch brings x86-64 and i386 closer together, eliminating an oops
that LTP test ioperm02.c causes on x86-64.  An IO port permission bitmap
must be followed by an extra 0xff.

(Add comments to that effect, to avoid the problem in the future).

link_path_walk() currently treats the special filenames ".", ".."
and "/" differently in that it does not call down to the filesystem in
order to revalidate the cached dentry, but just assumes that it is
fine.

  For most filesystems this is OK, but it the case of the stateless
NFS, this means that it circumvents path staleness detection, and the
attribute+data cache revalidation code on such common commands as
opendir(".").

This change provides a way to do such revalidation for NFS without
impacting other filesystems. 

Note: the failure to revalidate the path here does not result in a
call to d_invalidate() unlike (all?) other calls to d_revalidate(). It
only results in an ESTALE error being returned to the caller.

- Roadrunner address is defunct
- 3c501/Z85230 are no longer maintained
- Update other stuff because I will be away for a year

into home.osdl.org:/home/torvalds/v2.5/linux

into kernel.bkbits.net:/home/davem/net-2.5

Remove duplicate string definition. Same table already defined and
exported in irlan_event.c

Ircomm in 2.6.0-test3 can just set the owner field in the tty structure
like other drivers, and not mess with MOD_INC/MOD_DEC.

- set owner field on tty ldisc
- allocate network device objects with alloc_netdev
- use list_head macros and put locking around list of devices
- convert to seq_file for /proc
- use change_mtu hook rather than guessing at mtu changes

When doing the audit for this change, it was obvious that several drivers
allocate but never free the net_device.

This fixes these drivers.  This patch is riskier than the earlier
ones, because it isn't just a simple substitution and maybe there
is a reason they never free.

Drivers that use kfree in destructor are easily converted
to use free_netdev.

Replace kfree with free_netdev in cleanup routines
of protocols and network pseudo drivers.

s/kfree/free_netdev/ in cleanup routines of a bunch
of different network drivers.

Replace kfree with free_netdev

s/kfree/free_netdev/ as appropriate for tokenring drivers.

Simple one line substitution of kfree with free_netdev
for the bulk of the network drivers.

This patch adds the free_netdev function and associated
changes so that net_device structures are not freed until
last reference to the network device class is released.

into kernel.bkbits.net:/home/davem/net-2.5