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

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

 - export the __div64_32 symbol for modules;

 - add likely() to the fast path (divisor>>32 == 0);

 - add __attribute__((pure)) to __div64_32() prototype so
   the compiler knows global memory isn't clobbered;

 - avoid building __div64_32() on 64bit architectures.

* whitespace cleanup
* removal of unused members of netdev priv struct
* extendable arrangement of h/w reset logic

* Perf cleanup: s/int/unsigned int/ for descriptor ring indexes
  [suggestion by Jeff Garzik].
* Perf cleanup: cache references to ring elements using local pointer

* h/w workaround: several 10's of thousands of 82547 controllers where
  mis-fused during manufacturing, resulting in PHY Tx amplitude to be
  too high and out of spec.  This workaround detects those parts, and
  compensates the Tx amplitude by subtracting ~80mV.

* Cleanup: ethtool diags: only reset if not if_running.

* Bug fix: alloc_etherdev failure didn't cleanup regions in probe.

* Bug fix: missing Tx cleanup opportunities during interrupt handling.

* Bug fix: fix VLAN support on PPC64 [Mark Rakes (mrakes@vivato.net)]

* Bug fix: request_irq() failure resulted in freeing resources twice!
  [Don Fry (brazilnut@us.ibm.com)]

This patch addresses a minor regression reported by Rhine-I users (leading
to occasional Tx timeouts).

I also merged some cosmetic changes.

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

Remove un-used commented module_exit functions from m68knommu
ColdFire and 68328 serial drivers. These drivers currently cannot
be configured as modules, and they have no exit functions.

Global SECURITY_INIT macro cannot be used inside .init section
for m68knommu linker script. It is a complete section of its own,
need to just list the components individually.

Conditionally copy the ROMfs filesystem on the NETtel/5307
target board only if using a ROMfs.

DragenEngine setup code updates:

 - Change interrupt handler return type to irqreturn_t
 - Allow configure time setting of boot parameters
 - Clean up warnings

Conditionally copy the ROMfs filesystem on the SecureEdgeMP3/5307
target board only if using a ROMfs.

Configuration updates for 68328 DragenEngine board. Fix up name
so that it is "DragenEngine" and clean up eeprom read.

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

   The intent patches broke behaviour w.r.t. following symlinks when
doing an open() with file creation. The problem occurs in open_namei()
because the LOOKUP_PARENT flag is no longer set when we do the call to
follow_link().

This is the updated versions of the patch Ingo sent some time ago to
implement a new tgkill() syscall which specifies the target thread
without any possibility of ambiguity or thread ID wrap races, by passing
in both the thread group _and_ the thread ID as the arguments.

This is really needed since many/most people still run with limited PID
ranges (maybe due to legacy apps breaking) and the PID reuse can cause
problems.

This allows suspend to work on UP machines, even if the kernel
is compiled for SMP.

Due to a typo in powernow-k7.c, the value which correspond
to the CPU core multiplicator and the VID value are swapped
when we go down to up in frequency step.

This adds a declaration that the macserial driver needs in order to
compile correctly, and removes some old SERIAL_DO_RESTART junk which
isn't used (SERIAL_DO_RESTART is never defined in this driver) and which
I think is incorrect anyway, since it looks to me like it would
potentially return an ERESTARTSYS error without a signal pending.

switch_mm and enter_lazy_tlb take a CPU arg, which is always
smp_processor_id().  This is misleading, and pointless if they use
per-cpu variables or other optimizations.  gcc will eliminate
redundant smp_processor_id() (in inline functions) anyway.

This removes that arg from all the architectures.

kstat_this_cpu() is defined in terms of per_cpu instead of __get_cpu_var.

This patch changes that, and uses it everywhere appropriate.  The sched.c
change puts it in a local variable, which helps gcc generate better code.

No longer need the 68360 specific trap init call. The generic
interrupt/trap code is now setup to do this itself.

Define the raw read and write access macros for m68knommu.
These rae use by MTD drivers in particular.

Clean up show_process_blocks() loop for non-mmu targets.

This patch includes the last peices of the flat laoder shared
library support. Define the shared lib limit and implement a
flag for doing kernel level tracing.

A couple of minor fixes for the 68328 interrupt setup code.

 - don't define the .romvec section for DragonEngine build
 - print newline at end of spurious interrupt count in show_interrupts()