Update copyright messages, module meta-information, banner comments
and the MAINTAINERS file to better reflect the current
authorship/maintainership status.  In particular puts Pavel Roskin as
the most prominently displayed maintainer, since he has done nearly
all non-trivial work on the driver for a year or more.
Signed-off-by: David Gibson <hermes@gibson.dropbear.id.au>

Index: working-2.6/drivers/net/wireless/hermes.c
===================================================================

Update various constants and structures in orinoco header files.  The
updates generally represent either newer hardware/firmware features,
or corrections to what we know about hardware/firmware functions.
Signed-off-by: David Gibson <hermes@gibson.dropbear.id.au>

Index: working-2.6/drivers/net/wireless/hermes.h
===================================================================

In line with normal kernel conventions, don't create typedefs for
structures.
Signed-off-by: David Gibson <hermes@gibson.dropbear.id.au>

Index: working-2.6/drivers/net/wireless/hermes.c
===================================================================

Remove some unnecessary #includes.
Signed-off-by: David Gibson <hermes@gibson.dropbear.id.au>

Index: working-2.6/drivers/net/wireless/orinoco_pci.c
===================================================================

Use some macros defining driver names and version to reduce the number
of places that need to be changed when the version changes.  Also use
these to make it easier to keep printk() messages with a consistent
prefix.
Signed-off-by: David Gibson <hermes@gibson.dropbear.id.au>

Index: working-2.6/drivers/net/wireless/orinoco.c
===================================================================

Random trivial cleanups that don't belong with anything else:
	- Use ETH_DATA_LEN instead of hard-coded constant
	- Remove a duplicated constant in an | expression
Signed-off-by: David Gibson <hermes@gibson.dropbear.id>

Index: working-2.6/drivers/net/wireless/orinoco.c
===================================================================

Make various functions and variables static which always should have
been, but weren't.
Signed-off-by: David Gibson <hermes@gibson.dropbear.id.au>

Index: working-2.6/drivers/net/wireless/orinoco_tmd.c
===================================================================

Use BUG_ON() macro instead of explicit if(x) BUG() in various places.
Signed-off-by: David Gibson <hermes@gibson.dropbear.id.au>

Index: working-2.6/drivers/net/wireless/orinoco.c
===================================================================

Various trivial cleanups to the orinoco driver: whitespace changes,
spelling/capitalization errors corrected, some fairly insignificant
comments added, removed or reformatted.
Signed-off-by: David Gibson <hermes@gibson.dropbear.id.au>

Index: working-2.6/drivers/net/wireless/orinoco.c
===================================================================

Anti-spam obfuscate most email addresses in the orinoco driver files.
Yes, this is closing gate long after the sheep have run, but I guess
it can't hurt.
Signed-off-by: David Gibson <hermes@gibson.dropbear.id.au>

Index: working-2.6/drivers/net/wireless/orinoco.c
===================================================================

Use the built in ARRAY_SIZE macro, instead of hard coding it
ourselves.
Signed-off-by: David Gibson <hermes@gibson.dropbear.id.au>

Index: working-2.6/drivers/net/wireless/orinoco.c
===================================================================

Use the kernel's ALIGN macro instead of our own dodgy version for
rounding things up to an even number.
Signed-off-by: David Gibson <hermes@gibson.dropbear.id.au>

Index: working-2.6/drivers/net/wireless/orinoco.c
===================================================================

Use the netdev_priv() macro instead of directly accessing dev->priv.
Signed-off-by: David Gibson <hermes@gibson.dropbear.id.au>

Index: working-2.6/drivers/net/wireless/orinoco.c
===================================================================

Rearrange functions in the orinoco driver in a more logical order.
This patch is large and looks complicated, but in fact only moves code
around (within or between files) without changing it.  The only
exceptions are some extra comments describing the file's layout, and
updated prototypes for the new function order.

This makes the order of functions match the 0.15rc1 version, so later
patches have a fighting chance of being meaningful.
Signed-off-by: David Gibson <hermes@gibson.dropbear.id.au>

Index: working-2.6/drivers/net/wireless/orinoco.c
===================================================================

Remove various bits of code in the orinoco driver for backwards
compatibility with older kernels: old versions of the wireless
extensions, lack of MODULE_LICENSE, older PCMCIA interfaces.
Signed-off-by: David Gibson <hermes@gibson.dropbear.id.au>

Index: working-2.6/drivers/net/wireless/orinoco.c
===================================================================

This fixes several small but serious x86-64 bugs in 2.6.8rc2:

 - Fix array overflow in PCI bus checking (Travis Betak) 
 - Fix broken pci_map_sg in swiotlb (Suresh B. Siddha)
 - Remove bogus bus check in IOMMU code
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

into ppc970.osdl.org:/home/torvalds/v2.6/linux

* prism54_get/set_debug_oid are missing checks for a null pointer.
  Reported in Bugzilla number 100.

* In the card initialization routine, we try to set the
  output power. For firmware < 1.0.4.3, this leads to a
  worrying "mgt_commit has failed .." in the log although
  the device continues to react normally.
  Fix is simple, do not try to configure output power.
  (which I believe we should not be doing anyway as it is
   probably against local country regulations)

* Reintroduce pushing 0 into the TRDY_TIMEOUT and RETRY_TIMEOUT
  registers. Make this configurable with module parameter
  init_pcitm.

* We now have the ludicrous situation that some hardware setups
  require this (not even pushing 0xFF helps), whilst others
  don't care either way (the majority), and yet others bork
  if anything is pushed into these regs.
  If anybody can explain this (including Conexant :-) ), my ears
  are open.

* oid_mgt.c is calling islpci_mgt_transaction passing the address
  of a pointer to the management frame. This is not being
  initialized by the caller. The callee only updates this
  pointer when successful. When not, boom.

* Being ultracautious again, not only initialize in the caller,
  also null out the pointer unconditionally in the callee.

into tiger.hpl.hp.com:/data1/bk/lia64/to-linus-2.5

	Wrong ifdef around ppc nvram_read_byte() - it should be
CONFIG_GENERIC_NVRAM.

[that's it for today; there's more (fb stuff), but I'd rather make that
a separate series]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

	compile fixes in open_pic.c - it missed cpumask conversion in several
places.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

	usual "shift definition of inlines before their uses" in a couple of
places in drivers/*
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

	a couple of "replace char with explicit s8 to make sure it's really
signed" fixes.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Linus Torvalds <torvalds@osdl.org>

	a) ppc KGDB builds only on two subarch; say so in Kconfig
	b) ide-pmac.c can't be a module; make it dependent on IDE=y.
	c) a bunch of isdn drivers is broken on ppc; marked as such
	d) oaknet is broken; marked as such (includes on files that do not
exist, etc.)
	e) buslogic and cyber2000 are broken on sparc64
	f) s3trio framebuffer is broken
	g) usual 8250-based serial is broken on sparc64; in principle it might
be worth supporting (there are PCI cards of that sort), for now marked as
broken (no asm/serial.h, to start with).
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Usual foo ? void : non-void  in reiserfs; gets triggered on big-endian
platforms.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

	asm-ppc/reg.h defines pollutes namespace like there's no tomorrow;
among other things there are
	LR
	SR0...SR15
	DEC
etc.

That breaks quite a few drivers that should otherwise work on ppc.  SR...
and LR were never used by ppc code; commented out in reg.h (note that
they are just aliases for SPRN_SR... and SPRN_LR).  RPA commented out and
its instances in ppc code (all four of them) replaced with SPRN_RPA.  Ditto
for DEC.  The rest of the offenders (DAR and PVR) are left alone for now and
#undef'ed in drivers in question.

We probably want to rip all these guys out of reg.h and convert ppc users
to SPRN_... forms - file ends up included in alot of places and namespace
pollution like that is a Bad Thing(tm).
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Assorted pointer-to-int fixes:
	a) some places want to take pointer modulo alignment or extract
integer that was cast to pointer (which is legitimate), but do that via
wrong cast, triggering sparse warnings.
	b) usual %x (int)ptr -> %p ptr fixes
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Either it got missed back when if_mii() was introduced, or it got merged
that way later.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Linus Torvalds <torvalds@osdl.org>

zoran procfs code switched to seq_file and cleaned up; a bunch of homegrown
procfs glue eliminated.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

cciss compat ioctls were broken (mixing kernel and userland pointers);
fixed (and cleaned up) by switch to compat_alloc_user_space() and elimination
of set_fs().
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Usual set - explicit -D<arch>=1 for sparse, __sighandler_t / __sigrestore_t
annotated, annotations in arch/ppc/kernel/*, etc. - same as for other platforms
Signed-off-by: Linus Torvalds <torvalds@osdl.org>