From: Erdi Chen
Signed-off-by: Dave Airlie <airlied@linux.ie>

Correct a couple of packet length calculations.

From: Keith Whitwell
Signed-off-by: Dave Airlie <airlied@linux.ie>

oops before we got to this sanity check. As it hasn't
triggered in any bug reports I've been able to find, I think
it's safe to nuke it.
Signed-off-by: Dave Jones <davej@redhat.com>

remove virt_to_bus completely.. will fix up drm to use proper 
interfaces instead later..
Signed-off-by: Dave Airlie <airlied@linux.ie>

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

into starflyer.(none):/home/airlied/bitkeeper/drm-fntbl

Fixup ffb driver and interfaces it uses, also avoid bus_to_virt
on sparc, I'll look into using the proper APIs for the DRM soon.
Signed-off-by: Dave Airlie <airlied@linux.ie>

Remove __HAVE_DMA and __HAVE_IRQ and associated macros.
Also remove GET_MAP related macros... 
Signed-off-by: Dave Airlie <airlied@linux.ie>

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

Patch from Ben Dooks

Include the central code for detecting the cpu in use,
and initialising it's IO. Updated all mach-XXX.c files to
use this new init.

Added the first stage of the new serial port code by
calling s3c2410_init_uarts() instead of just setting
a variable.

Updates mach-h1940.c to prefix with h1940_ instead of ipaq_

Small fixes for redundant code

Signed-off-by: Ben Dooks 

Patch from Dave Jiang

Rewrite if uncompress.h to use the proper machine_is_X function call.

Patch from Dave Jiang

arch/arm/mm

Removed offending #ifdefs for MACH names. Grouped into different IOP families.

Patch from Dave Jiang

arch/arm/mach-iop3xx update
Removed busy while loop and replaced with mdelay() from patch 2036/1

Patch from Dave Jiang

arch/arm/kernel changes

Patch from Dave Jiang

arch/arm/configs
updates for defconfigs for all IOP platforms

Patch from Dave Jiang

This patch depends on the applied patches of 1963/1 2017/1
This is the arch/arm/boot directory

As to address RMK's previous questions in head-xscale.S, all that are workarounds
for improper things coming from redboot. Currently the distribution redboot for IOP does not pass in correct MACH ID or setup the memory map correctly after exec (according to Deepak). So we have to fix it. I'm working on pushing the IOP redboot developer to fix those things at a later date.

Patch from Ben Dooks

Add PWM timers 0 through 3

Update ID on single devices to -1

Signed-off-by: Ben Dooks 

Patch from Ben Dooks

NAND flash controller register definitions

Patch from Ben Dooks

Definitions for the SDIO/MMC controller on the S3C2410

Patch from Ben Dooks

Fix erroneously removed IO region which causes the reboot
by watchdog to fail to reboot with an OOPS.

Thanks to Herber Potzl for finding this.

Signed-off-by: Ben Dooks 

Patch from Marc Singer

This patch changes the system jiffies timer to use TIMER2 so that a
given platform can use TIMER1 to drive the buzzer.  Note that only
TIMER1 can be used to drive a buzzer.

Signed-off-by: Marc Singer 

Patch from Bo Henriksen

This patch is part of the UDC driver for the lh7a40x sdk. 
Please submit this patch for 2.6.9, otherwise the UDC driver will not work.

Patch from Ben Dooks

Added CTRL2,CTLR3 and CTRL4 definitions to bast-cpld.h

Signed-off-by: Ben Dooks 

Patch from Ben Dooks

Resend of Patch 2062/1 with the commenbts from rmk
applied, so that CPU_S3C2410 / CPU_S3C2440 are 
automatically selected without user intervention

Signed-off-by: Ben Dooks 

Patch from David Brownell

This makes /proc/cpuinfo more accurate on many ARM processors, so that
for example ARMv5TEJ processors always show they have Thumb (T),
EDSP (E), and Java (J) capability.

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

Anton Blanchard noted that vmlinux.lds is using .lock.text but
__lockfunc was using .spinlock.text.

Make them consistent.
Signed-off-by: Zwane Mwaikambo <zwane@linuxpower.ca>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

inode semaphore handling.

happen under normal workloads and does not indicate a problem.

SGI Modid: xfs-linux:xfs-kern:178055a
Signed-off-by: Nathan Scott <nathans@sgi.com>

* prism54_get_freq is incorrectly returning channel
* and not frequency. Wireless tools detect this, but
* other programs do not, leading to insane reported
* values. (As Jean documents, drivers should really be
* reporting the frequency).
* An example is wavemon.

The attached patch fixes an integer overflow in drivers for N2, C101,
PCI200SYN WAN cards (brv * port->settings.clock_rate overflowed at
requested clock rate of 8*1024*1024 bps, problem noted by Nagaraj Kanniah).

This splits timer resource from 0x40-0x5f to 0x40-0x43, 0x50-053 for
x86_64.  A patch doing this for i386 was released earlier.  Forgot that
we have two x86 platforms.

missing le32_to_cpu() in printk
Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Lots of crap.  It looks like the thing had never been really tested on
big-endian boxen...  Aside of usual "forgot to convert" bugs there's a cute
one - foo->le16field = cpu_to_le32(bar) does not work on big-endian...
Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Some callers of fat_date_unix2dos() (in msdos/namei.c and vfat/namei.c)
forgot to convert returned host-endian date and time to little-endian.
Since all callers want to get little-endian values, moved the conversion
into function itself.
Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Several places printk a little-endian number without any conversions.
Ones in super.c are particulary unpleasant - there we are getting told that
fs couldn't be mounted because of the following set of incompat features
and it would be nice to have the printed number matching what one could
find in headers...
Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>