Do socket locking for AX.25
Delete trailing whitespace.
Exchange prehistoric changelogs in headers with GPL + copyright header.
Reformat some of the NET/ROM and ROSE code to 80 columns.

Implement proper locking in ax25_accept() and nr_accept().
Add back line of code lost in last manual merge.

Fix arguments to write_lock & co. of which many were passed the lock, not a pointer to one.

into dea.linux-mips.net:/home/ralf/src/ax25/linux-2.5

various compilers

This patch removes an artifact of code left over from the 2.0 days when
the kernel didn't use flat segments.

The preceding memcpy() already takes care of the NULL ptr mapping.

Unfortunately, someone changed the inb and friends definitions and
broke ARM.  This patch allows ARM to build NE2000 based drivers
again.

The following patch adds support for CONFIG_GENERIC_ISA_DMA, which went
into the 2.4-ac kernel series prior to 2.5 happening.

The following patch allows architectures to decide whether they want
the generic ISA DMA functionality provided by kernel/dma.c and other
supporting files.

In addition, we move the procfs "/proc/dma" support code out of fs/proc
into kernel/dma.c, and adapt it to use the new seq_file code.

The following patch is required so that munmap(0x8000, *) does not cause
ARM kernels to crash.  The problem is that the machine vectors are at
virtual address 0.  Unfortunately, when free_pgtables() is called, it
clears first level page tables starting at 0 in this case, and takes
out the machine vectors.  This then results in an unrecoverable hang.

We already have FIRST_USER_PGD_NR to define the first entry in the pgd
which may be cleared, so we use this to clamp "start_index"
appropriately.  The following patch does this.  Tested on ARM.

Bitops are used with on the timer_alive variable.  Therefore, timer_alive
needs to be "unsigned long" not "int".

Trivial patch; removes cruft that got left over from the TLB shootdown
changes.  "dir" is never used in zap_page_range

Various modules (eg, rd.c) use simple_strtol.  This patch exports the
symbol so these modules can be loaded.

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

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

This patch (against 2.5.30) contains all of the changes to generic code
needed by UML.

CREDITS -
	Changes my address and adds a UML credit for Lars Brinkoff.

MAINTAINERS -
	Adds a UML entry.

Makefile -
	When ARCH=um is on the command line to do a UML build, the old value
	of ARCH is saved in $(SUBARCH) for the later use of the UML build.

drivers/char/Makefile -
	Sets KEYMAP, KEYBD, CONSOLE empty to prevent hardware drivers from
	being compiled in.

drivers/net/setup.c -
	Backs out a UML hook which leaked into your tree which UML no
	longer uses.

This a preparatory patch which allows UML to avoid changing linux/linkage.h.

It restructures linkage.h so that all of the arch-specific stuff is in
asm-*/linkage.h.  linux/linkage.h is now arch independent.  It should be
functionally unchanged.

Five arches, i386, ia64, sh, m68k, and arm, have non-empty linkage.h files.
The other arch linkage.h files are all empty.

Also, __ALIGN_STR is no longer defined independently of __ALIGN.  It is now
derived by stringizing __ALIGN.

Following a suggestion by Keith Owens, stringify.h was generalized to allow
commas in its argument, linkage.h now includes it, and no longer defines its
own stringify macros.

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

From Rusty.
The old form of designated initializers are obsolete: we need to
replace them with the ISO C forms before 2.6.  Gcc has always supported
both forms anyway.

(rmk - cleaned up spacing to be more reasonable)

From: (via Rusty) Art Haas <ahaas@neosoft.com>
Here are patches for files in fs/adfs. Patches are against 2.5.26.

(rmk - updated for 2.5.30, cleaned up spacing to be more reasonable)

From: (via Rusty) James Mayer <james@cobaltmountain.com>

3c503, hp-plus, smc-ultra, smc-ultra32, wd