Andrew spotted this one, here's the fix:

Remove usage of "current" as a variable name and structure member
in the battery management code of PowerMac via-pmu and apm-emu
drivers

delete obsolute CONFIG

- fix warning
- byte swap miss fix
- 16bit bus access problem fix

Fix any warnings

- duplicate define marge.
- unused define delete.
- reduced code size.

Illegal usp corrected a set problem in starting of thread.

This driver won't build with CONFIG_LBD due to a 64 bits division.

Use the "simple" fix of a cast down to 32 bits, this is only
a floppy driver, no need to do sector_div.

cpu_possible_map is needed by some modules, export it.

While perusing the driver I noticed a workaround we don't have in the
Linux driver.  The comment I added explains the issue.

This patch removes the code that tweaked the L1 cache when setting
up the L2 one. That was added a while ago in the intend of making
things more robust but ended up breaking earlier 750 CPU setup.

Also fix some crap in the L1 cache code that is only used for the
powermac sleep at this point.

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

pktsched_init() and tc_filter_init() converted to subsys_initcall().
initialization of individual qdisc and tcf_proto switched to
module_init().  Some of them used to be registered twice if built-in, BTW.
init failure handling in sch_teql.c fixed - it used to leave objects
(both qdisc and netdev) registered if insmod failed.

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

From: Ralf Baechle <ralf@linux-mips.org>

Below following 125547 lines of patches, all to arch/mips and
include/asm-mips.  I'm going to send the remaining stuff of which the one
or other bit may need to be discussed in smaller bits.

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

into debian.org:/usr/src/kernel/ieee1394-2.6

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

Patch from Holger Schurig

PXA Serial port (FFUART, BTUART, STUART) and console support 
 
This patch works perfectly here with "console=ttyS0,115200" in the 
kernel command line. It contains Jean-frederic Clere fix to detect 
STUART and BTUART.

Nico said that I should post it to your patch tracker. It replaces patch 1662/1

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

Update the Acorn VIDC sound interrupt handler to return IRQ_HANDLED.

Unfortunately some i2c drivers were missed when the "name" element of
struct device was removed.  This cset fixes these drivers.

Patch from Deepak Saxena

Follows your suggestion and also removes the #ifdef around
pci_unmap_addr and friends. Since pci.h should only be getting
included if PCI is enabled by PCI drivers and core, we shouldn't
need the NOP version.

Patch from Tony Lindgren

The following patch adds the ARM925 processor support.

This patch is based on the proc-arm925.S in 2.4 kernel, and it has been
modified to be more like the ARM926 support in the 2.6 kernel, except for
the cache flushing and initialization. Also, this patch fixes the
writeback cache flushing for most part.

There are still some issues with writeback cache flushing with devices 
using direct memory access, such as USB OHCI. It is recommended to use
the writethrough instead if using USB. This is the default for OMAP-1510.
OMAP-1610 does not have these issues, as it uses ARM926 core.

This patch includes the update for the processor functions to be armv4t 
instead armv5t as suggested here:

http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=1740/1

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

- Update listhelp.h to benefit from prefetching
- More efficient selective_cleanup() impl. in conntrack
- Export number of conntrack buckets via r/o sysctl.

From David Miller.

Don't list icside.o in drivers/ide/pci/Makefile - it's in drivers/ide/arm.

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