From: Randy Hron <rwhron@earthlink.net>

Put version.h in the file that needs it.
Remove version.h where it isn't needed.
Tested as module/non-module on x86.

From: Randy Hron <rwhron@earthlink.net>

Three small 1-line patches to get rid of any remaining __SMP__
references in the 2.6 kernel. 

From: Ron Gage  <ron@rongage.org>

From: Daniele Bellucci <bellucda@tiscali.it>

This patch audits some copy_from/to_user in the SysKonnect FDDI device
driver.

This patch catches insures proper return values from
copy_to/from_user calls.

From: Ron Gage <ron@rongage.org>

From: Daniele Bellucci <bellucda@tiscali.it>

Insert ioremap error check and adjust cleanup path accordingly.

From: Leann Ogasawara <ogasawara@osdl.org>

From: Daniele Bellucci <bellucda@tiscali.it>

add 'static' to a function

From: Randy Hron <rwhron@earthlink.net>

remove unneeded linux/version.h usage & some duplicate
#includes;

Dmasound: Use try_module_get()/module_put() instead of methods calling
MOD_{IN,DE}C_USE_COUNT (from Christoph Hellwig)

Dmasound core fixes from Christoph Hellwig:
  - Some exported symbols are declared __init - in the modular case this is
    freed before the other modules can call it..
  - dmasound.lock is initialized too late, do it at compile time

Hugh Dickins caught this confusion between the ret variable in outer
scope (holding the fd) and the return value of f_setown.  Rename inner
"ret".

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

move all watchdog documentation into Documentation/watchdog/

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

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

This fixes two buts that the glibc NPTL verification tests found, one
new and one old.

The new bug is that "offset" has been declared as an alternative in
the union, instead of as an element in the structures comprising it,
effectively eliminating it from the key: keys match which should not.

The old bug is that if futex_requeue were called with identical
key1 and key2 (sensible? tended to happen given the first bug),
it was liable to loop for a long time holding futex_lock: guard
against that, still respecting the semantics of futex_requeue.

While here, please let's also fix the get_futex_key VM_NONLINEAR
case, which was returning the 1 from get_user_pages, taken as an
error by its callers.  And save a few bytes and improve debuggability
by uninlining the top-level futex_wake, futex_requeue, futex_wait.

Noticed by Tejun Huh <tejun@aratech.co.kr>.

This patch fixes a race condition between the pcmcia socket initial
insert processing, ds.c and cardmgr.  This allowed cardmgr to believe
that a card was inserted while the card is still in the process of
resetting itself, and it therefore tried to read the CIS while it
was unavailable.

We change the meaning of SOCKET_PRESENT slightly - it now means that
a card is present _and we have completed its initialisation_.  We
introduce SOCKET_INUSE to indicate that we have a reference count
against the module.

We also take the skt_sem to prevent clients from registering while
we're handling an insert/remove/suspend/resume.

socket references are pointers, not integers.

		<Patch from Rusty Russell>
	o [FEATURE] Add module aliases to dongle drivers

		<Patch from Guennadi Liakhovetski>
	o [FEATURE] Don't leak stuff in various failure paths
	o [FEATURE] Properly initialise self->max_header_size in IrIAP

	o [CRITICA] In case of connect watchdog, drop reference to the LAP
	o [CORRECT] Prevent dumping LSAP after connect watchdog
	o [CRITICA] Prevent dumping TSAP if dumping LSAP did fail
	o [CORRECT] Only set connected bit on response if LSAP state is correct

	o [CRITICA] Fix a race condition when closing the LAP
		prevent the stack to open new LSAPs while we are killing them.

	o [FEATURE] Finish removing traces of old irtty driver

		<Patch from Jan Frey>
	o [CORRECT] Make NSC 3839x probe and init *really* work
		The new 3839x code was totally broken.
		Won't affect code for regular 38108/38338 chips.

	o [FEATURE] Finish removing traces of old module refcount stuff

into kroah.com:/home/linux/BK/gregkh-2.6

Hereby you may find my patch for a Medion digital camera along with the
/proc/bus/usb/devices output.

Original patch from oliverthered@oliverthered.com ... this
updates it:

  - usb_epnum_to_ep_desc() only looks at the active altsetting
  - docs clarified

It's possible some user mode drivers will have relied on the
previous buggy behavior, since usbfs uses this call.  The fix
will be for them to set the appropriate altsetting.

into osdl.org:/home/mochel/src/kernel/linux-2.5-core

From Randy Dunlap.

From Dominik Brodowski: 

A few missing exports -- even though the cpu_sysdev_class isn't strictly
needed now, I need it for a few ACPI-related patches I'll send out in a
minute.

into osdl.org:/home/mochel/src/kernel/linux-2.5-core

into kernel.bkbits.net:/home/mochel/linux-2.5-core

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

A recent change to the 2.6.0 kernel has changed the behavior of opening a
block device with the O_EXCL flag.  This can cause fsck.jfs to fail to
replay the journal when a file system is mounted read-only.

The JFS utilities have been fixed, and it is recommended that any users of
JFS update the utilities to version 1.1.3.