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

The attached patch makes s390 sclp driver buildable again.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

Patch from Ben Dooks

Add definitions to the MISCCR register for configuration
of the signal states in power down mode.

Signed-off-by: Ben Dooks 

Patch from Ben Dooks

Include file include/asm-arm/arch-s3c2410/regs-iic.h,
for the I2C controller on the S3C2410 Samsung SoC.

Signed-off-by: Ben Dooks

Patch from Ben Dooks

Header file include/asm-arm/arch-s3c2410/regs-mem.h containing
definitions for the S3C2410 memory controller

Signed-off-by: Ben Dooks 

Patch from Dave Jiang

Latest IQ80331 redboot changed value of ATU registers and is causing master aborts on the plugged in card. Changing value back to previous sane state for Linux.

Signed-off-by: Dave Jiang (dave.jiang@gmail.com)

Patch in replacement of 2099/1 due to formatting problems.

Some compilers seem to get "%?" wrong in macros.

We really need to check that we have access to the whole of the
signal frame when we allocate it, rather than "most of it" when
we have iWMMXt extensions selected.

- Use ISA_DMA_THRESHOLD as the mask for GFP_DMA allocations.
- Don't allow DMA allocations which are for a "smaller" mask than
  ISA_DMA_THRESHOLD.
- Ensure that "handle" is initialised to our error value when
  returning an error.

Add locking for use of kecardd services.
Use wait_event_interruptible() rather htan interruptible_sleep_on().

Patch from Ben Dooks

Fix missing changelog entries in <asm-arm/arch-s3c2410/hardware.h>,
and erroneous EINT definitions in <asm-arm/arch-s3c2410/regs-gpio.h>.

Added s3c2410_gpio_getcfg(pin) and s3c2410_gpio_getirq(pin)
to get the current configuration of an pin, and which IRQ
(if any) maps to it.

Signed-off-by: Ben Dooks 

Patch from Ben Dooks

USB power control and over-current sense

Signed-off-by: Ben Dooks 

Patch from Ben Dooks

Port power control and management for S3C2410 internal
USB controller for different boards to interface their
power control system to.

Signed-off-by: Ben Dooks 

Patch from Sascha Hauer

This patch fixes the i.MX timer functions:
- imx_gettimeoffset() now returns proper values
- fix timer interrupt frequency

Signed-off-by: Sascha Hauer 

After the "ppc64 monster cleanup," I get

    powerpc-750-linux-gnu-strip: vmlinux: File format not recognized

from my ppc32 strip command when cross-compiling a ppc64 kernel, since
vmlinux is a 64-bit ELF file.  This patch fixes my build (and the
resulting kernel boots fine).
Signed-off-by: Roland Dreier <roland@topspin.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Ulrich Drepper points out that EPOLL_CTL_DEL doesn't need to copy any of
the hash events.

Also, we should specify in the man pages that a NULL is allowed in
EPOLL_CTL_DEL.  Currently it does not say that. 

Also, starting from when epoll uses rbtrees instead of hashes, the
'size' hint passed to epoll_create(2) is no more used.  But since an API
change has clearly to be excluded, I guess it'll stay as is.
Signed-off-by: Davide Libenzi <davidel@xmailserver.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Add $DEVPATH to the environmental variables during /sbin/hotplug call.
Signed-off-by: Josef 'Jeff' Sipek <jeffpc@optonline.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Josef "Jeff" Sipek <jeffpc@optonline.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Make the PowerMac7,3 no longer unknown.
Signed-off-by: Andreas Schwab <schwab@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Missing up() on an error path.

Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

into cantab.net:/home/src/ntfs-2.6

      where we forgot to unmap the extent mft record when we had finished
      enumerating an attribute which caused a bug check to trigger when the
      VFS calls ->clear_inode.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>

Document DRM's usage of 'd' as its ioctl identifier.  This can't be
changed, it is in every X server.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

If the blockdev doesn't implement BLKFLSBUF and returns -ENOTTY we should
still go ahead and perform the VFS-level sync.  We need to test for both
ENOTTY and EINVAL because some SCSI drivers incorrectly return EINVAL.
Signed-off-by: Ed L Cashin <ecashin@coraid.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Remove lingering PC-9800 doc.
Signed-off-by: Randy Dunlap <rddunlap@osdl.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

thanks Xu for noticing, some whitespace found it's way there.
clean that up.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

EDD fails with ACARD scsi devices present (hang on the 16bit bios call at
boot)
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

People have had a long time to change and be aware of the correct return.
Some drivers now generate the correct return too.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Following patch updates the IXP4xx MTD driver with the latest
version from MTD CVS.
Signed-Off-By: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Deepak Saxena <dsaxena@plexity.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

I made a patch to upgrade some header files for m32r.

- Change to use temporary register variables allocated by the compiler,
  instead of fiexd register varialbes.
- Change __inline__ to inline.
Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Miscellaneous upgrade for recent m32r kernel changes.

	* arch/m32r/kernel/entry.S:
	Add system calls; taken from asm-i386/unistd.h.
	- [PATCH][2/6] perfctr-2.7.3 for 2.6.7-rc1-mm1: i386  (05/31/2004)
	- [PATCH] Make key management use syscalls not prctls (09/06/2004)

	* arch/m32r/kernel/io_m32102.c: Remove.
	This file is no longer used. Please remove this file.

	* arch/m32r/kernel/irq.c: 
	- Fix the unnecessary entropy call in the irq handler.

	* arch/m32r/kernel/signal.c:
	- Merge common signal handling fault handling in generic code;
	  use force_sigsegv() instead of force_sig().

	* arch/m32r/kernel/smp.c:
	- Just add brackets.

	* include/asm-m32r/hardirq.h:
	- factor out common <asm/hardirq.h> code
Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Here is a patch to update comments for Renesas.
The M32R processor is a product of Renesas Technology Corporation now.

	* arch/m32r/kernel/setup.c:
	- Change from "MITSUBISHI" to "Renesas"
	- Remove RCS ID.
	* arch/m32r/kernel/setup_m32700ut.c: ditto.
	* arch/m32r/kernel/setup_mappi.c: ditto.

	* arch/m32r/kernel/setup_mappi2.c: 
	- Remove RCS ID.
	* arch/m32r/kernel/setup_oaks32r.c: ditto.
	* arch/m32r/kernel/setup_opsput.c: ditto.
	* arch/m32r/kernel/setup_usrv.c: ditto.

	* include/asm-m32r/m32102.h:
	- Add copyright statement of Renesas
	- Remove RCS ID.
	* include/asm-m32r/m32r.h: ditto.
	* include/asm-m32r/m32r_mp_fpga.h: ditto.
Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>