This fix got missed in the bonding patchset applied a while ago.

Ensure that arm ether drivers print the correct ether device name rather
than "eth%d".

Fixes build on some platforms.

From: "M.H.VanLeeuwen" <vanl@megsinet.net>

The level of isapnp_init was moved to after apci sometime ago.  Since it is
now after net_dev_init, ISA PNP NICs fail to initialized at boot.  This is
particularily problematic for NFS root filesystems like mine, or none
modular systems.

This fix allows ISA PNP NIC cards to work during net_dev_init, and still
leaves isapnp_init after apci_init.

This driver is freeing skb's from timer context, with local irq's disabled.

It generates warnings from local_bh_enable() because local_bh_enable()
reenables interrupts, exposing the machine to deadlocks.

So use the deferred dev_kfree_skb_irq() instead.

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

From: Klaas de Waal <klaas.de.waal@hccnet.nl>

Bug in parameter of ZERO_PAGE macro in line 679 of fb/direct-io.c Parameter
dio->cur_user_address has to be dio->curr_user_address.  This bug shows
when compling for MIPS little endian as target, not when compiling for X86.

From: Matthias Andree <matthias.andree@gmx.de>

Properly terminate /proc/tty/driver/serial output lines of known UARTS
when the caller has no CAP_SYS_ADMIN capability.

From: Andi Kleen <ak@muc.de>

Export two symbols on x86-64.  This is needed for the sk98lin driver and ipv6.

Use unsigned long for time_after(), not an int.

From: "Brad House" <brad_mssw@gentoo.org>

Quick patch to enable the Philips tuner on the WinTV-D boards.  Tested and
works fine.  (acked by Gerd)

The wait_event() in there can touch the memory at *transaction after
kjournald has freed it.

Rework the code to not wait until the transaction enters T_FLUSH state: just
loop back and try against after the wakeup.

Use the correct type for the workqueue callback.

Patch to get ibmtr_cs / ibmtr working again.  A change went in a while back
I missed that killed it.  Also fixed the timer to eliminate the
uninitialized timer error on close.

http://bugzilla.kernel.org/show_bug.cgi?id=1341

http://bugme.osdl.org/show_bug.cgi?id=1171

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

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

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

Here's a show-stopper patch for Alpha; missing it prevents several of
our platforms ("white box" 3000 and 5000 series) from booting.

- HAVE_DEC_LOCK depends on SMP
- Trap return preemption check needs interrupt disabled check
- Implement write_trylock
- Fix in_atomic() definition when PREEMPT enabled

Here is the minimal patch that fixes things that do not work and that
can be noticed fairly easily:

        - remove a typo in pfm_check_task_state() which causes
          PFM_READ_PMDS to fail when context is in  PFM_MASKED state.

        - fix a typo in perfmon_mcklinley.h when checking the value
          combinations for when writing to PMC14. This could reject a
          valid request to program PMC14.

This fixes a sleep-in-spinlock bug for binfmt_misc registration.

That lock is purely for the list, not for the dentry.

Only set the rate/resolution if the user actually asked
for it. Some mice and KVM switches don't like to have
their rate forced.

exit_notify() used to leave a window open when a thread
died that made the thread visible as a ZOMBIE even though
the thread reaped itself. This closes that window by marking
the thread DEAD within the tasklist_lock.

into tiger.hpl.hp.com:/data1/bk/lia64/to-linus-2.5