into nuts.ninka.net:/home/davem/src/BK/net-2.5

1. pci_device_id structures shouldn't be __devinitdata.  Greg removed
   all of the instances of this in the 2.6.0-test1 tree, but unforunately
   my recent coversion of lanai.c introduced another one.

2. The lanai PCI id constants have now been merged into the kernel headers
   so we don't need to define our own copies.

3. The ioctl's exported by lanai shouldn't be - they were intended for
   debugging only, never for release.  For now they're just '#if 0'ed out.
   They're somewhat dangerous since they don't check any capabilities so
   any user could DoS the interface.

From: Leann Ogasawara <ogasawara@osdl.org>

Acked by Neil Brown.

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

The ARC and A5K machine class is handled by the arm26 architecture
now.  This cset removes the obsolete files from the 32-bit ARM
architecture.

ARM seems to have missed an update for the time keeping code; this
cset fixes a problem where the altering the system time changes the
reported uptime.

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

this patches removes unneccessary calls to yenta_init()/ti_set_zv() in
ti1250_init() as the called ti113x_init() already does this..

Fix 32/64-bit error in ext2_file_write; before, the top 32-bits of
the return value was getting chopped off.

Various 32-bit emulators need to fill in linux_binprm.interp

it does not work like a C function.

(Effectively, the first argument ends up being "passed-
by-reference" without the use of pointers)

 misc      : - Signed cleanups.
	     - Convert to correct min/max macros.

 subsystem : - Attempt to fix sleeping call in hpsb_get_tlabel when
	       preempt is enabled.

 eth1394   : - Fix packet sizes for S800+.

There's a bug in AS, it sets HARDBARRIER on a request when it should be
setting it as a softbarrier. IO scheduler has no business using that
bit, if it needs to put barriers there they should be soft. Hard
barriers involve hardware operations.

Fix up several errors in the PXA code preventing it from building.

into flint.arm.linux.org.uk:/usr/src/linux-bk-2.5/linux-2.5-rmk

into flint.arm.linux.org.uk:/usr/src/linux-bk-2.5/linux-2.5-pcmcia

In tg3_init_rings() we might write out to the NIC SRAM area,
thus we should only run it when the chip is in a known state.
Also, fix comments above tg3_init_rings() wrt. locking state.

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

Trivial CREDITS update

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

The mdelay() macro does the wrong thing if you try to use it with an
argument expression that contains the (perfectly natural) variable name
'msec'.

Fix it to use an internal variable that doesn't clash with normal
naming.

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

into kernel.bkbits.net:/home/davem/sparc-2.5