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

Remove static flash device location definitions since they're now
obsolete.  Additionally, dynamically allocate driver private data
structures.

Use partitioning information passed in via the platform device
instead.  This means that individual machine files in
arch/arm/mach-sa1100 can contain their partitioning information.

- combine sa1100_locate_partitions with sa1100_mtd_probe.
- set device driver data in the probe method, and use this to get
  at our driver private information in the other methods.

This prepares the SA1100 flash driver to accept platform data via
the driver model.

This removes a bunch of SA1100 machine support files which have been
unable to be built for a while, due to missing out on updates.

Warning of removal had been posted to the ARM kernel mailing list,
and this cset represents those which did not attract any interest.

This adds platform_device-based partition and map information for
badge4, cerf, collie, h3600, hackkit and shannon SA1100 machine
types.

Patch from Ben Dooks

S3C2410/S3C2440 RTC driver using arch/arm/common/rtctime.c as
a base. Supports alarm, and periodic IRQ from 1 to 64Hz

Signed-off-by: Ben Dooks
Signed-off-by: Russell King

Patch from Dave Jiang

Remove nolonger used file from arch/arm/mach-iop3xx/mm-321.c

Signed-off-by: Dave Jiang
Signed-off-by: Russell King

The more relaxed memory ordering od the __raw_{write,read}b broke things
on ppc in the recent rivafb cleanups.

[ Uglyness alert: only the 8-bit accesses are more strongly serialized. 
  The 16- and 32-bit ones have always been relaxed. Gaah. ]
Signed-off-by: Guido Guenther <agx@sigxcpu.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

Patch from Nicolas Pitre

The declaration of generic_fls recently changed from
extern inline to static inline.

Signed-off-by: Nicolas Pitre
Signed-off-by: Russell King

Patch from Ben Dooks

Add register definitions for channel hardware
sources, and update for s3c2440 extra bits.

(should be applied after #2226/1 and #2227/1)

Signed-off-by: Ben Dooks
Signed-off-by: Russell King

Patch from Ben Dooks

Added EXPORT_SYMBOL() to appropriate routines

(should be applied after Patch 2226/1)

Signed-off-by: Ben Dooks
Signed-off-by: Russell King

Patch from Ben Dooks

Add sysfs class and devices for s3c24xx-dma code, and
add simple pm suspend code to ensure all channels are
stopped before suspending

Signed-off-by: Ben Dooks
Signed-off-by: Russell King

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

The patch below fixes a problem with shutting down 802.3ad bonds on the 2.6
kernel.  Taking the interface down or removing the module causes a stack
dump if spinlock debugging is enabled.  This patch was generated from the
2.6.9 kernel.

This patch has been peer reviewed by our Linux software engineering team,
and the fix has been verified by our test labs.
Signed-off-by: Mitch Williams <mitch.a.williams@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

This patch undoes a change that we believe will impact performance
adversely, by creating possibly too long a delay between servicing
completions.  The comment pretty much explains it.  We need to call both
cleanup routines each pass through the loop, this time we have a comment
explaining why.
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

Obviously pci_enable_device should be called after pci_restore_state.
Signed-off-by: Li Shaohua <shaohua.li@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

This fixes a bug where netpoll can dereference a null ifa_list pointer when
not supplied an IP address at module load and the interface is up but no IP
is configured.

Bonus: unrelated netif_running cleanup

Signed-off by: Jeff Moyer <jmoyer@redhat.com>
Signed-off by: Matt Mackall <mpm@selenic.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

It seems to result in unexplained memory corruption. Matt is working on it.

Cset exclude: Matt_Domsch@dell.com[torvalds]|ChangeSet|20041020153622|50713

Limit the number of legacy ptys to 256.  pty_line_name() isn't capable of
generating more than 256 unique names.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

task_nice() was exported for binfmt_elf, however that's no longer modular. 
normalize_rt_tasks() is used by the sysreq code only, which isn't modular.
Signed-off-by: Arjan van de Ven <arjan@infradead.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

- cdev_get is only used in fs/char_dev.c; move it up, make it static and
  unexport it.

- cdev_put is used in one more place (fs/file_table.c) but never in
  modules; unexport it.
Signed-off-by: Arjan van de Ven <arjan@infradead.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Code looks like it intended to parse "%%" in pattern string as "%".  Fix
it, so it really does that.

Compile and run tested.
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Convert MODULE_PARM() to module_param().
Signed-off-by: Randy Dunlap <rddunlap@osdl.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Convert MODULE_PARM() to module_param().
Signed-off-by: Randy Dunlap <rddunlap@osdl.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Updates to Documentation/md.txt - included some extra info I found out
while digging deeper into init/do_mounts_md.c
Signed-off-by: James Nelson <James4765@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The 'faulty' personality provides a layer over any block device in which
errors may be synthesised.

A variety of errors are possible including transient and persistent read
and write errors, and read errors that persist until the next write.

There error mode can be changed on a live array.

Accessing this personality requires mdadm 2.8.0 or later.
Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

As the unplug timer can potentially fire at any time, and and it access
data that is released by the md ->stop function, we need to del_timer_sync
before releasing that data.

(After much discussion, we created blk_sync_queue() for this)
Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Contributions from Jens Axboe <axboe@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Sometimes it didn't read all (working) drives before a parity calculation.
Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Some size fields were "int" instead of "sector_t".
Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch fixes some of the drivers' fb_blank() implementation which got
the usage of the VESA_* constants incorrectly and converts them to use the
new FB_BLANK-* constants.

I'm not sure if what I did is correct for all drivers, so maintainers,
please review.

(Note: For most of the drivers, FB_BLANK_NORMAL is treated as
FB_BLANK_UNBLANK, but returns a nonzero so fbcon will do a soft_blank).
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch converts most drivers to use the new FB_BLANK_* constants.
These drivers have correct fb_blank() implementations.
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>