HP300 frame buffer device updates from Kars de Jong:
  - Updated to use the new DIO semantics
  - Added support for DIO-II boards
  - Added support for 8 bit Catseye boards
  - Fixed colour map support
  - Added fb_blank() implementation
  - Added fb_fillrect() implementation
  - Added fb_sync() implementation
Signed-off-by: Kars de Jong <jongk@linux-m68k.org>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

HP300 LANCE updates from Kars de Jong:
  - Updated HP LANCE driver to use the new DIO semantics
  - If only HP LANCE or MVME147 LANCE is selected, enable compile-time
    choice of LANCE register access. If both are defined, go through the
    function pointer
  - Added support for CONFIG_NET_POLL_CONTROLLER
  - Fixed problem with disabling board interrupts in hplance_close() which
    caused the driver to lock up
Signed-off-by: Kars de Jong <jongk@linux-m68k.org>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

HP300 DIO bus updates from Kars de Jong:
  - Removed kludges for internal HPIB, no need to handle it as a DIO device
  - Removed dio_scodetoviraddr() and introduced dio_scodetophysaddr() instead,
    to be able to support DIO-II
  - Removed trailing white space
  - Changed error return code of dio_find() from 0 to -1, since select code 0
    is a valid select code
  - Added support for DIO-II
  - Fixed problem with DIO_ENCODE_ID()
Signed-off-by: Kars de Jong <jongk@linux-m68k.org>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Update of HP300 core support to use bootinfo etc. (from Kars de Jong)
Signed-off-by: Kars de Jong <jongk@linux-m68k.org>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Add comments and references for relied-upon translations
Add some extra comment to space_check
Add support for prober and probew in our non-access TLB fault emulation path
Force sr2 to 0 in syscall_restore
Committed-by: Carlos O'Donell <carlos@parisc-linux.org>

Fix compile error when HPUX support is enabled
Committed-by: Randolph Chung <tausq@parisc-linux.org>

fix __kernel_clock_t definition so that e.g. proper process times are returned
to userspace
Committed-by: Randolph Chung <tausq@parisc-linux.org>

Make atomic_t an int instead of a long to match the other architectures
Committed-by: Matthew Wilcox <willy@parisc-linux.org>

Remove unused asm/som.h (Olaf Hering)
Committed-by: Matthew Wilcox <willy@parisc-linux.org>

Register usage documentation update
Committed-by: Randolph Chung <tausq@parisc-linux.org>

Remove gcc alias directive to fix gcc-3.3.4 64-bit kernels
Committed-by: Carlos O'Donell <carlos@parisc-linux.org>

 - pdc_printf from Randolph Chung
 - implement memory barriers in debuglocks
Committed-by: Thibaut Varene <varenet@parisc-linux.org>

 - Fix SMP f_list corruption problem.

   This was rather subtle.  It turns out that gcc was doing a small
   amount of reordering around the file_lock because it doesn't see our
   spinlock implementation as being a barrier.  To fix this I

   - Added the appropriate barriers to all the spinlocks.
   - Removed the atomic opencoded spinlock and redid it as a proper one.

   SMP now seems stable on a 2xA500 and has survived a 10 hour 35 loop
   make -j 4 kernel compile without showing any problems (previously, it
   usually fell over in the first loop).

 - Since we have one or two users who don't want SMP, make the
   code base compile for UP again ...

 - missing parenthesis for pointer dereferencing
Committed-by: James Bottomley <jejb@parisc-linux.org>
Committed-by: Thibaut Varene <varenet@parisc-linux.org>

- fix unwind table search so it works reliably
- add special case handling for ret_from_kernel_thread and _switch_to_ret
- tidy up the code a bit
- Fix sp falling in an unmapped kernel page
- Sparse annotations
Committed-by: Randolph Chung <tausq@parisc-linux.org>

Indentation and comment cleanup
Committed-by: Grant Grundler <grundler@parisc-linux.org>

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

This set of changes came from a larger patch by Adrian Bunk.

Patch from Liam Girdwood

Adds some PXA register and bit definitions:-
  o SSP ports
  o I2S
  o AC97_SYSCLK (Mainstone)
  o I2C Alternate function and direction
  o ASSP and NSSP Clock enables

Signed-off-by: Liam Girdwood 

Patch from Liam Girdwood

This patch adds support the PXA250, 255, 26x and 27x SSP ports. It
provides a generic core for simple IO-based SSP applications and allows
easy port setup for DMA access.

Depends on register definitions in patch 2084/1

Signed-off-by: Liam Girdwood 

 follows non-static declaration build error

Patch from George G. Davis

Building kernels with recent gcc-4.0-20041024 snapshot results in
"static declaration of '__clz_tab' follows non-static declaration"
build error. Since the "extern const UQItype __clz_tab[]" definition
is not required, this patch removes it to fix the build.

Signed-off-by: George G. Davis 

 static declaration build error

Patch from George G. Davis

Building kernels with recent gcc-4.0-20041024 snapshot results in
"static declaration of 'meminfo' follows non-static declaration"
build error. Since the "extern struct meminfo meminfo" definition
is not required, this patch removes it to fix the build.

Signed-off-by: George G. Davis 

 endian

Patch from Lennert Buytenhek

When you issue the mnfd opcode to negate a double, nwfpe is supposed
to flip the most significant bit of your double, which is the sign
bit.  However, on big endian systems, it ended up flipping the most
significant bit of the least significant sub-u32, which is one of the
mantissa bits.

On my system this was manifesting itself as sed regression tests
failing, and ntpd/ntpdate consistently adjusting the system clock
into the wrong direction.

In pretty much all of NWFPE, doubles are stored in u64s and
manipulations on those doubles are done by using u64 bitops.  But
for negation and fabs() it was poking into one of the sub-u32s
directly instead of XORing the u64 with 0x8000000000000000 resp.
ANDing with 0x7fffffffffffffff.

Since on big-endian, 'native u64 order' means that the most
significant byte (containing bits 63-56) is kept at the lowest
byte address, the sign bit is the MSB of the first sub-u32,
instead of the MSB of the second one as is the case on little
endian.

Signed-off-by: Lennert Buytenhek 

 conditional on ARCH_H720X

Patch from G N Barzini

Currently under "System Type" you are always offered "h720x
Implementations" regardless of the system type selected. The fix for
this in the other Kconfig files seems to be enclose their contents
conditional in 'if ARCH_FOO'/'endif'. This patch does that.

Patch from Ben Dooks

This patch fixes the following problems:

- panic() in reset should be warning print, so that the
  system can then be soft-reset if this ever happens

- arch_idle() can now be over-ridden for purposes of
  implementing dyanmic voltage scaling (DVS) or any
  other form of idling

Signed-off-by: Ben Dooks 

Patch from Nicolas Pitre

Signed-off-by: Nicolas Pitre 

- Add iomd, keyboard and acornfb platform devices.
- Convert rpckbd to use centrally registered platform device.
- Convert acornfb to use a platform device.

m68k used to do this by hand, but it really ends up being needed
for any environment that does cross-builds, so just do it
unconditionally.

This should mean that you never need to cross-build sparse or
have any other hacks for checking a cross-built environment.

This way you can do a checking run on UP too - even if the
locks don't actually _matter_, they should still be right,
I'd hope.

In particular, a function that is called with a lock held, and
releases it only to re-acquire it needs to be annotated as such,
since otherwise sparse will complain about an unexpected unlock,
even though "globally" the lock is constant over the call.

This annotates the scheduler routines for locking, telling
what locks a function releases or acquires, allowing sparse
to check the lock usage (and documenting it at the same time).

and atomic_dec_and_lock.

This means that we now have all of the spinlock context counting
infrastructure in place, and you can check-compile the kernel with 
sparse -Wcontext.

We rename the actual architecture-specific low-level implementation
to have a prepended underscore: "_atomic_dec_and_lock()".

This extra macro indirection is so that we can make the macro do
the lock context counting. That will be the next patch.

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

- Add definition for SActive register
- Add most interrupt sources to default interrupt mask
- Write low 32 bits of FIS address to PxFB, where they belong
- Set command active bit in PxSACT before setting command issue bit in PxCI
- Announce Sub Class Code in driver info message [IDE, SATA or RAID]

and additionally, from me [jgarzik]:
- ignore ports-implemented bitmap for now; it's a write-only register
  that silly BIOSen initialize incorreclty
Signed-off-by: Matthijs Melchior <mmelchior@xs4all.nl>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

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