into cheetah.(none):/home/davem/src/BK/sparc-2.6

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

From: Dominik Brodowski <linux@dominikbrodowski.de>

This brown paper bag patch is needed to assure cpufreq_update_policy works
correctly.

Please apply, else the next ACPI patch will cause trouble with thermal
management [it needs cpufreq_update_policy to work properly].

Fix a horribly wrong memcpy instruction in cpufreq_update_policy which
caused it to oops.

From: Torsten Duwe <duwe@suse.de>

pmdisk.c uses struct new_utsname, so give it the header.

From: Christoph Hellwig <hch@lst.de>

Put kernel_flag back to where it used to be, near its comment and its
EXPORT_SYMBOL.

From: Andi Kleen <ak@muc.de>

Just fix two warnings on x86-64 that were recently introduced (one by me
and the other by the sort extable changes)

  Add comment for HdrS ver 0x201

into hopper.(none):/usr/src/kernel/sparc-2.6

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

  - Fix kconfig botch (bk automerge can be rather flakey)
  - The gadgetfs patches going with the kconfig cleanups

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

into kroah.com:/home/greg/linux/BK/i2c-2.6

into kroah.com:/home/greg/linux/BK/usb-2.6

Here is a patch that brings the lm75 and lm78 drivers in compliance with
sysfs naming conventions. The drivers as found in existing 2.6 kernels
do not have a digit appended to the temperature-related files names as
the sysfs naming conversion recommends (obviously because they each have
a single temperature channel). As a result, libsensors won't find the
files.

It was discussed on the list wether a '1' should be appended in this
case, and our conclusion was that it would be better to do so because it
helps automatic processing of the sysfs exported files. Please apply if
you agree with this.

On Tue, 27 Jan 2004, Greg KH wrote:

> Hm, can you send me a patch to fix up snd_usb_extigy_boot_quirk() in
> sound/usb/usbaudio.c now that this patch broke that code?  :)

Here it is.  The problem with changing things in the core is always that
you may miss some of the repercussions.  In this case the patch will
restore the code's original functionality.

However the whole thing looks a bit creaky to me.  Changing device
descriptors and who knows what else without informing usbcore isn't a good
idea.  What this code _really_ appears to need is some form of
usb_device_reenumerate().  Such a function would fit very nicely into the
framework I've worked out for the revised usb_device_reset(); maybe I'll
add it in there.  It would do essentially the same thing as device_reset
except for skipping the actual port reset.

I accidentally left a debug printk in the sn2 timer_interrupt().

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

into intel.com:/home/lenb/src/linux-acpi-test-2.6.2

into intel.com:/home/lenb/src/linux-acpi-test-2.6.1

        from ia64 via Alex Williamson

	from Jes Sorensen

	from Jes Sorensen

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

This patch fixes a simple error in a couple of utility routines.  They
will no longer try to dereference a NULL actconfig pointer.  Also, they
will work a little better if the configuration is changed while they are
running (which should never happen anyway).

The following patch adds support for the ADM1025 evaluation board to the
i2c-parport (and i2c-parport-light) driver(s). In fact, it happens that
it was already supported as an ADM1032 evaluation board, so it is just a
matter of documenting it correctly.

This is not needed, and messes up working devices.

sleep_on must die.... and it fixes a few races too ;)

This fixes a conflicting declaration in xbow.c.

	works without trashing any registers.