From: Paul Mackerras <paulus@samba.org>

This patch changes PCI_DMA_TODEVICE to DMA_TO_DEVICE in a couple of
places in drivers/net/ibmveth.c, since it doesn't compile without this
change and it does compile with it.  It also reformats a couple of
over-long lines in the vicinity of the other changes.

From: Niraj Kumar <niraj17@iitbombay.org>

This is in continuation of the ufs2 read-only code that went into 2.6.5.

This patch fixes a bug where wrong content was being read off the disk
after around 4 MB mark.

From: Anton Blanchard <anton@samba.org>

It's been there since the kernel was first imported into bk.  We see no
reason for this.

From: Arjan van de Ven <arjanv@redhat.com>

root_nfs_name is called one in single threaded environment; can use static.

From: Jeff Mahoney <jeffm@suse.com>

This patch fixes a problem with the serial conversion to tiocm[sg]et.

The paste from rs_ioctl included the command sanity checking, but there's no
command for tiocm[sg]et.  The compile ends up failing.

From: "Luiz Fernando N. Capitulino" <lcapitulino@prefeitura.sp.gov.br>,
      me

drivers/pcmcia/rsrc_mgr.c: In function `find_io_region':
drivers/pcmcia/rsrc_mgr.c:604: warning: large integer implicitly truncated to unsigned type

We don't really know what underlying type an ioaddr_t has, so just use an
integer here and let the compiler promote it appropriately.

From: Samium Gromoff <deepfire@sic-elvis.zel.ru>

Without this one it fails to build, too.

From: Samium Gromoff <deepfire@sic-elvis.zel.ru>

Without this one it fails to build.

From: Nick Wellnhofer <wellnhofer@aevum.de>

hfs_fill_super in 2.6.5 returns -EIO instead of -EINVAL if a valid supe=
block isn't found.  So mount_block_root in init/do_mounts.c bails out before
trying to mount the root device as XFS.

From: <gerg@snapgear.com>

A few fixes for the 68328 "DragonBall" serial driver:

. use irqreturn_t for interrupt handlers
. correct a few variable types (stop compiler warnings)
. correctly use return values from put_user(), get_user() and copy_to_user()

Many of these originaly from kernel janitors.

From: <gerg@snapgear.com>

A whole bunch of fixes for the ColdFire serial driver:

. remove unused CONFIG_LEDMAN code
. reformat port definitions to new style structure init
. change "addr" field type to reduce casting in ColdFire serial driver
. cleanup locking problems in mcfrs_write().
. implement fraction baud rate clock support for hardware that
  supports it (namely the ColdFire 5272)
. implement wait_until_sent, some ColdFire parts of hardware support
  for this (again the 5272).
. correctly use return values from put_user(), get_user() and copy_to_user()

Many of these originaly from kernel janitors.

From: <gerg@snapgear.com>

Change "addr" field type to reduce casting in ColdFire serial driver.

From: Jeff Garzik <jgarzik@pobox.com>

DC390_init() takes a long, not an int.

40k reduction in my vmlinux.

Thanks to Denis Vlasenko <vda@port.imtp.ilyichevsk.odessa.ua> for performing
the analysis.

Saves 3.4k from my vmlinux.

Thanks to Denis Vlasenko <vda@port.imtp.ilyichevsk.odessa.ua> for performing
the analysis.

Shrinks my vmlinux by an astonishing 28k.

   text    data     bss     dec     hex filename
3038796  589890  150612 3779298b  39aae2 vmlinux.before
3009761  590107  150612 3750480  393a50 vmlinux.after

Thanks to Denis Vlasenko <vda@port.imtp.ilyichevsk.odessa.ua> for performing
the analysis.

From: Vincent Sanders <vince@kyllikki.org>

The vga16fb driver uses a direct ioremap on 0xa00000 to gain access to the
vga card.  This is wrong on architectures other than x86, every other driver
uses VGA_MAP_MEM macro from vga.h to ensure the correct memory mapping.

From: Matt Mackall <mpm@selenic.com>

Base hash sizes on available memory rather than total memory.  An
additional 50% above current used memory is considered reserved for the
purposes of hash sizing to compensate for the hashes themselves and the
remainder of kernel and userspace initialization.

From: Russell King <rmk@arm.linux.org.uk>

Cleanup the 4 duplicate "get_files_struct" implementations into one
get_files_struct() function to compliment put_files_struct().

From: William Lee Irwin III <wli@holomorphy.com>

This optimisation was reverted when I was removing all users of page->list.
Bill fixed it up, so unrevert it again.

From: Sam Ravnborg <sam@ravnborg.org>

When building external modules the $PWD/.tmp_versions directory is used.
The .tmp_versions directory in the kernel tree cannot be used because this
would clutter up the kernel tree especially when more than one external
module is being build for the same kernel tree.

This patch make sure to create $PWD/.tmp_versions, and to delete it during
make clean.  It also removes warning about 'messed with SUBDIRS', this is
no longer relevant when .tmp_versions is made outside the kernel tree.

From: Andy Whitcroft <apw@shadowen.org>

When clearing a large page allocation ensure we use a page clear function
which will correctly clear a ZONE_HIGHMEM page.

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

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

M68k: Make sure machine-specific interrupts are always printed (bug introduced
by show_interrupts() conversion)

Amiga Ethernet drivers: Print card info after calling register_netdev(), to
avoid dev->name still being 'eth%d'.

M68k: Update time adjustment code cfr. other architectures.
(perhaps do_gettimeofday() is a good candidate for consolidation across archs?)

M68k TLB fixes from Roman Zippel:
  - Check current->active_mm for currently active mm
  - Set correct context to flush the right ATC entry
This is especially important for kswapd to correctly flush unmapped entries (it
caused random segfaults during large compiles)

m68k: Use explicit-sized types for I/O accesses

Amikbd: Use C99 array initializers and standard key defines

M68k: Clean up initializers:
  - Convert struct/array initializers to C99 style
  - Do not initialize data to 0 or NULL explicitly so it can move to bss

M68k: Add remaining CPU vector definitions

Sun-3: Kill duplicate definitions:
  - FC_CONTROL is defined in <asm/sun3-head.h>
  - vectors[] is declared in <asm/traps.h>

MVME16x RTC: Make days_in_mo[] const

Zorro8390: const data cannot be in the init data section (from Roman Zippel)

Permedia2: Always use the standard barrier macros (they do exist on m68k, and
map to barrier())

Permedia2: Mark pm2fb broken on Amiga, until somebody fixes it (pm2fb.c
explicitly tests for CONFIG_PCI right now)

Zorro: Quieten building of devlist.h (cfr. PCI)

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

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