into pobox.com:/spare/repo/netdev-2.6/ALL

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

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

Patch from Marc Singer

The work already done to rectify the timer code initialization missed
a necessary change.  This patch adds a timer initialization function
to the LPD7A400 machine type.  It also makes a small correction to the
kernel configuration that is out of step with the machine specific
Kconfig.

Patch from Marc Singer

This patch aligns the lh7a40x port with the updated structure of IDE
drivers.  It also removes an unused FIQ handler.  This patch is made
in order to get the lh7a40x port to build.

Patch from Catalin Marinas

This patch replaces the -mshort-load-bytes option with $(call
check_gcc,-malignment-traps,-mshort-load-bytes) in the CFLAGS
setting in arch/arm/Makefile.

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

into kernel.bkbits.net:/home/davem/sparc-2.6

In the *ppos cleanups, proc_dol2crvec was updated, but the prototype
found at the top of kernel/sysctl.h was not, generating warning.  This
corrects the prototype to match the code.

(I'm gonna take a stab at moving these into arch/ppc shortly)
Signed-off-by: Tom Rini <trini@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

We allow more commands if the disk was opened read-write.

They'll need it for permission checking.

Signed-off-by: David S. Miller <davem@redhat.com>

Normal users shouldn't have access to the raw device anyway
unless they are in the trusted "disk" group, but let's require
RAWIO capabilities. That's what the original SCSI interfaces
did anyhoo.

We probably _should_ just require write access, but that will
need more of a code change to pass down the file descriptor.

We must setup the queue before calling elevator_init(), otherwise the
elevator cannot use the queue members. This really hurts cfq since it
checks ->nr_requests, which is zero at that time.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

CONFIG_SERIAL_8250_MANY_PORTS should not be set for these boards, as
they only have 2 serial ports.
Signed-off-by: Tom Rini <trini@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

With 'len' being unsigned now, we must make sure it never tries
to go negative...

Thanks: griffon26@kfk4ever.com (Maurice van der Pot)
Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Eliminates costly atomic bitops in do_sparc64_fault.
Signed-off-by: David S. Miller <davem@redhat.com>

It is bogus, plus it breaks the build with
CONFIG_SWAP disabled.

Based upon a patch from Ben Collins (bcollins@debian.org)
Signed-off-by: David S. Miller <davem@redhat.com>

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

into dwmw2.baythorne.internal:/inst/bk/mtd-2.6

Patch from Jun Sun.
Signed-Off-By: David Woodhouse <dwmw2@infradead.org>

- Add Millennium Plus support.
- Add advanced probe configuration options
- Fix abuse of buffer space in scan for Media Header.

Define callback wrapper function mtd_erase_callback() to handle 
partition offsets during the callback, rather than attempting to 
fix them up in the freed erase_info structure after the callback 
has already happened.

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

Signed-off-by: Andrew Morton <akpm@osdl.org>

From: Mathieu LESNIAK <maverick@eskuel.net>


This patch corrects a problem with Netgear FA311
ethernet card (a cheap one). Without it, the MAC address is byte swapped
ie :
HWaddr 02:00:07:E3:E9:F5
instead of :
HWaddr 00:02:E3:07:F5:E9

(the correct MAC address vendor code for Netgear/LiteOn is 00:02:E3)
Signed-off-by: Andrew Morton <akpm@osdl.org>

Signed-off-by: Andrew Morton <akpm@osdl.org>

The following patch adds a couple of missing byteswaps and allows the
Atmel wireless driver to work in WEP mode on big-endian CPUs. (tested
on powerPC).

* We are not correctly reporting supported bit rates.
* Fix it.

* Change the "version" OID to what it should be.
* Fix memory leaks - mgt_get_request always returns
* allocated memory for non-int OIDS (with an exception -
* keep reading). If the caller checks the return and itself
* returns, then it must free memory.
* However, it is possible to return from mgt_get_request
* early (!priv->mib). In this case, weird things can happen
* in isl_ioctl. Quick fix, at least to force an oops, is
* to set the union value to NULL. The real fix is to
* recode all mgt_get_request calls in isl_ioctl.

* We are handing back HANDLED even though the IRQ is not for us.
  We also change device state.
  This is plainly wrong.
  AFAICT we also need to take the spin lock early.
  Tested/running on UP/SMP for about a week now.
  (Discovered on one of my lappies that had the X driver on the same IRQ)
  (Proposed on Prism54 Devel with no objections)

* It seems that Viro patched prism54 with the following patch set :
http://www.kernel.org/pub/linux/kernel/v2.6/testing/cset/
cset-viro@www.linux.org.uk[torvalds]|ChangeSet|20040727040034|54764.txt

* I do not see any indication in any mailing list of this.
  It would be nice if we could be informed of such changes :-)

* (Changes committed to our CVS)

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