Patch from David Vrabel

Expand the IXP4XX_WATCHDOG (IXP4xx internal watchdog) config option help text with a note about its ineffectiveness.

Signed-off-by: David Vrabel
Signed-off-by: Russell King

Patch from Catalin Marinas

This patch enables the ARM922T configuration option for the
Integrator platforms (there is an Excalibur core module available).

Signed-off-by: Catalin Marinas
Signed-off-by: Russell King

Patch from Deepak Saxena

This patch borrows from the uclinux source where they have moved
the per-platform code for get_irqnr_and_base, disable_fiq, and
irq_prio_table out of entry-armv.S. However, instead of putting the
macros in arch/arm/mach-$(MACHINE)/entry-header.S, we just have
it in the machine's incdir. This means we don't need the extra
complexity of creating symlink at build time. The patch also removes 
the irq_prio_table as a requirement for all machines and makes it
specific to IOC/IOMD machines. 
  
This patch drastically shrinks entry-armv.S and allows us to delete 
and add machines without having to touch generic code (there were two 
dead machines laying around in entry-armv.S).
  
Tested on IXP4xx and test-built for just about every defconfig.

Signed-off-by: Deepak Saxena
Signed-off-by: Russell King

Originally submitted by Mike Waychison <Michael.Waychison@sun.com> in
August but apparently lost.
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

SCSI ioctls can ask for a lot of memory and fail. We don't need to vomit
in the log file for this case. Again taken from the Red Hat minor
patches applied for FC3.

Original-patch: Arjan van de Ven <arjanv@redhat.com>
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Paul Laufer informed the list that he had changed address and his change
of address had been ignored so CREDITS was still wrong although other
files had been updated.

Fix this.
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Red Hat got some confused customers due to this message. The confused
user case is when they update the BIOS and all of a sudden we have "no
suitable data" yet we did before. We (Arjan van de Ven) thus changed it
to "No new microcode" which is much much clearer.
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Add some more funky AC97 knowledge to the intel8x0 driver. These come
from Red Hat and its partners and are included in our shipping code.
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

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

into pobox.com:/garz/repo/net-drivers-2.6

into pobox.com:/garz/repo/net-drivers-2.6

into pobox.com:/garz/repo/net-drivers-2.6

into nuts.davemloft.net:/disk1/BK/net-2.6

Merry Christmas everyone. Ho ho ho!

rth tells me that some versions of gcc may end up using the
SSE registers for data movement when you do that.

Use "-march=i686 -mtune=xxxx" instead.

(We do the same thing for march=pentium2/4 too, just for
consistency).

evdev, joydev, mousedev, tsdev - remove class device and devfs entry when
hardware driver disconnects instead of waiting for the last user to drop off. 
This way hardware drivers can be unloaded at any time.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch adds missing lock_kernel()/unlock_kernel() pair in
reiserfs_get_dentry
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

mm/rmap.c contains an open-coded reference to swap_token_default_timeout
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

CFQ v2 has some spare queue logic that was never enabled.  It has an SMP
deadlock because it attempts to regrab the queue lock in the exit path, so
kill the spare queue stuff completely for 2.6.10.
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

switch_uid() doesn't care about tasklist_lock, so do it outside
the lock and avoid a subtle (and very very unlikely to trigger)
AB-BA deadlock.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This fixes a build failure with gcc-3.4.1, where we use some functions
before we define them inline. 

The simple way to fix those is to simply un-inline the functions in
question. Since they are somewhat large that's what I did.

An alternative would be to rework the ordering of the file so the
functions are defined before their first use.
Signed-off-by: Jesper juhl <juhl-lkml@dif.dk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

into oss.sgi.com:/oss4/bitkeeper/xfs-linux-2.6

agp=off disabled the agpgart driver, but not the chipset specific drivers,
which still did their init routines. Chaos ensued.
Signed-off-by: Dave Jones <davej@redhat.com>

From: Peer.Chen@uli.com.tw
Signed-off-by: Dave Jones <davej@redhat.com>

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

Remove ATA_FLAG_SATA_RESET.  See comment in code and
http://bugme.osdl.org/show_bug.cgi?id=3352 for more details.

This problem needs more investigation.  Removing the flag
appears to fix the problems in the field, so it's the best
temporary solution.

I missed this in the previous usb_kill_urb() cleanup.  Thanks to
Pat Mochel for reporting this.
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This is the patch to fix the case when snd_padding is not zero, updated
according to Duncan's comments.  Also it changes the driver name to reflect
its generic nature.
Signed-off-by: Roman Kagan <rkagan@mail.ru>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Moxa have released several driver updates now including support up to
2.6.8 but don't themselves feel its worth the effort of doing a cleaned
up merge for the base kernel.  So I pulled their latest driver release
(1.8) and removed all the macro gunge that makes it build on
2.2.0->2.6.8.  I then fixed it to run on 2.6.9/10 and fixed a bug in the
break handling.

It still doesn't do PCI hotplug but I don't have any PCI moxa cards to
really tackle that particular case. 

I've also merged Adriank Bunk's two 'could be static' changes into this
diff set.
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Fix suggested by Benjamin Herrenschmidt <benh@kernel.crashing.org>

On architectures like PPC, char is handled as "unsigned char", thus the
pcm_format_data table entries with -1 give a positive 255.  This results
in Oops with OSS-emulation on such architectures.

The patch simply adds the right signed/unsigned prefix to fix this problem.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Spotted by MASAO TAKAHASHI
Signed-off-by: Dave Jones <davej@redhat.com>

This fixes a warning when resuming the USB EHCI host controller driver.

From: David Brownell <david-b@pacbell.net>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

It's causing a few as-yet-not-understood problems.  So make a zero value of
/proc/sys/vm/swap_token_timeout disable the feature, and make the default
be zero.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch reverts the additions of an ABI supporting thread and process
CPU clocks in the posix-timers code.  This returns us to 2.6.9's condition,
there is no support for any new clockid_t values for process CPU clocks.

This also fixes the return value for clock_nanosleep when unsupported (I
think this is used only by sgi-timer at the moment).  The POSIX-specified
code for valid clocks that don't support the sleep operation is ENOTSUP.
On most architectures the kernel doesn't define ENOTSUP and this name is
defined in userland the same as the kernel's EOPNOTSUPP.
Signed-off-by: Roland McGrath <roland@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

Patch from George G. Davis

Just a quick update for integrator_defconfig so it builds a useable
kernel. These may not be ideal settings for all users but allows
building kernels for the Integrator AP which basically work "out
of the box".

Signed-off-by: George G. Davis
Signed-off-by: Russell King

Patch from Holger Hans Peter Freyther

This patch adds installation of flash devices and partition from within simpad.c . The information of extracted from the old sa1100 flash map.


Signed-off-by: Holger Hans Peter Freyther
Signed-off-by: Russell King

Patch from Holger Hans Peter Freyther

Remove the exportation of CS3 via procfs


Signed-off-by: Holger Hans Peter Freyther
Signed-off-by: Russell King