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 

It became obsolete when the termios locking was changed
to use a per-tty semaphore.

Some recent G5s have a problem with PCI/HT probing.  They crash (machine
check) during the probe of some slot numbers, it seems to be related to
some functions beeing disabled by the firmware inside the K2 ASIC.

This patch limits the config space accesses to devices that are present
in the OF device-tree.  This fixes the problem and shouldn't "add" any
limitation.  If you plug a "random" PCI card with no OF driver, the
firmware will still build a node for it with the default set of
properties created from the config space. 
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

      we did not clear ctx->al_entry but it was still set due to changes in
      ntfs_attr_lookup() and ntfs_external_attr_find() in particular.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>

A threaded app that posix-locks and closes the same file
in two threads concurrently may result in a posix lock
that was never visible to the closer, and that thus needs
cleanup on the final fput.

Handle it together with the regular flocks.

This makes the agreed change of termios locking to be semaphore based
sleep locking. This is needed for USB in particular as it has to use
messaging to issue terminal mode changes.

This code passes Torvalds test grades 0, 1 and 2 (it looks ok, it
compiles and it booted). It does mean that a driver cannot take an
atomic peek at termios data during an interrupt. Nobody seems to be
doing this although some of the driver receive paths for line
disciplines will eventually want to (n_tty currently doesn't do this
locked on the receive path). Since the ldisc is given a chance to copy
any essential bits on the ->set_termios path this seems not to be a
problem.

lock must not be held across the driver/ldisc downcalls.

Some drivers need to set device state (baudrate etc) and may
need to sleep.

Jeff Mahoney notes:

 "generic_shutdown_super() will happily call the ->put_super fs method,
  destroying data structures still in use by the iput (->delete_inode)
  in progress. 

  The unlink path will call the ->unlink fs method, release the path
  (thus dropping the reference to the vfsmount, and then call iput.
  Since the vfsmount reference is dropped back to 1, a umount will
  succeed, causing the superblock to be cleaned up."

Arrgh...  Here's the trivial fix: do the final "iput()" a bit earlier in
the unlink path. 

Note: all places that go to exit1: or exit: will have NULL inode, so we
are not leaking anything here and it is OK do that iput() early; indeed,
the goal of that kludge was to postpone the final iput() past the
unlocking the parent for the sake of contention if a wunch of bankers is
doing parallel unlink() on files in the same directory and normally it
would happen on dput() after vfs_unlink())

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

Patch to provide support for the following two boards:

	- Simtec BAST (EB2410ITX)
	- Thorcom VR1000
Signed-off-by: Ben Dooks <ben@simtec.co.uk>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

From: Carsten Haustein <chaus@cs.uni-potsdam.de>

A bug in function piix_config_drive_xfer_rate() allows a call of
hwif->ide_dma_on(drive) without prior call of piix_config_drive_for_dma().
This results in harddisk configured for UDMA (default?) whereas the highest
DMA mode supported by PIIX3 is MWORD2.

This bug is supposed to be present in any 2.6.x kernel release and any
2.4.x kernel release since 2.4.21.

bart: this should also fix the same bug for PIIXa and PIIXb

Fixes bugzilla bug #3473.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

ide-default driver was added long time ago.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

- CONFIG_IDE_TASK_IOCTL_DEBUG cannot be defined
- function declarations are used instead of calls
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Fixes OOPS on two single channel controllers.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

In sys_mlockall(), flags validation and can_do_mlock() check don't
require holding mmap_sem.  Move down_write() down a bit, and adjust
appropriately.
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Move the simple can_do_mlock() check before the full rlimits based
restriction checks for mlock() and mlockall().  As it is, the check
adds nothing.  This has a side-effect of eliminating an unnecessary call
to can_do_mlock() on the munlockall() path.
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Only check memlock rlimit against mm->total_vm when mlockall() flags
include MCL_CURRENT.
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Calling mlockall(MCL_FUTURE) will erroneously unlock any currently locked
mappings.  Fix this up, and while we're at it, remove the essentially
unused error variable.
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

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

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

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

Patch from Ben Dooks

Added code to remove the serial ports registered when
the module is unloaded.

Cleaned up ifdef'd code, and added copyright header

Signed-off-by: Ben Dooks 

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

Patch from Ben Dooks

Fixed bug where wrong bits where being masked in the
configuration registers for the GPIO pins

Signed-off-by: Ben Dooks 

Patch from Ben Dooks

Fix IRQ number for USB over-current on Simtec BAST

Signed-off-by: Ben Dooks 

Patch from Catalin Marinas

On ARM926EJ-S, the "always assume write" for Jazelle data aborts
causes Java code exit with segmentation fault every time it tries
to access a read-only page. This patch puts some restrictions on what 
can be done in the Jazelle state but it allows it to run.

Signed-off-by: Catalin Marinas 

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

From: <janitor@sternwelten.at>

Remove unnecessary cs_to_timeout() macro.  Use msleep() instead of
schedule_timeout() to guarantee the task delays for the desired
time.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Russell King <rmk@arm.linux.org.uk>

Fix NAT helper code to update TCP window tracking information
if it resizes payload (and thus alrers sequence numbers).

This patchlet was somehow lost during 2.4.x->2.6.x port of TCP 
window tracking :(
Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Yasuyuki KOZAKAI <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

into kernel.crashing.org:/home/trini/work/kernel/pristine/for-linus-ppc