Patch from Ian Campbell

The SA1100 watchdog driver also works fine on the PXA2xx. Tested on 
a PXA255 based platform.

Patch from John Lenz

Switches the collie framebuffer mach_info structure to use
the new initializers.
Signed-off-by: John Lenz <jelenz@students.wisc.edu>

Patch from John Lenz

The __sa1111_probe function is declared __init, and it is called from
the sa1111_probe function, which is not declared __init.
Signed-off-by: John Lenz <jelenz@students.wisc.edu>

into flint.arm.linux.org.uk:/usr/src/bk/linux-2.6-rmk

sock_fprog instances that had kernel pointer in ->filter (both of them -
in ppp_generic and isdn_ppp) replaced with explicit pairs len + kernel
pointer.  Copying of userland sock_fprog (with its __user ->filter)
cleaned up and sanitized.

Trivial annotation done in the rest of ->ioctl() in ppp_generic and
isdn_ppp.

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

into intel.com:/home/lenb/bk/linux-acpi-test-2.6.7

Reflect that only the dstirq depends on the dstapic.

into intel.com:/home/lenb/bk/linux-acpi-test-2.6.7

caused by errant fix for OSDL 2835

Make sure we only clear q->last_merge hint, if it matches the request
currently passed in.
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

To prepare kbuild for more kernel packaging formats move all packaging support
to scripts/package.

In top-level Makefile introduce generic support for all package formats using
target names *-pkg.  Included the old rpm target for backward compatibility.

A new variable KBUILD_IMAGE is used to specify what kernel image will be part
of the final package, and is to be set by the arch specific makefile.
KBUILD_IMAGE may be overridden from command line or environment.  KBUILD_IMAGE
will see wider usage later, mainly when installing kernel images.

Introducing KBUILD_IMAGE allowed arch specific details to be deleted from the
mkspec and builddeb scripts.

While in the process added the deb packet format.  Script is From: Wichert
Akkerman <wichert@wiggy.net>

To create a RPM packet use 'make rpm-pkg'.
To create a deb packet use 'make deb-pkg'.
Both targets are included in 'make help'
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

When using a separate output directory the in-kernel config wiere rebuild
each time the kernel was compiled.  Fix this by specifying correct path to
Makefile in the prerequisite to the ikconfig.h file.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

allmodconfig and allyesconfig are currently failing because they select
wanxl firmware rebuild, and that requires an m68k assembler toolchain.

Add a new generic option to the "Generic Driver Options" menu.  The option
is defaul equals y and prevents us from building firmware unless really
needed.

Firmware is usually provided in separate filer '_shipped', and there is no
need to rebuild them unless strictly required.  First user is WanXL - which
otherwise required a m68k tool-set to compile.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Fix path in <linux/idr.h> header file.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

drivers/video/tdfxfb.c:1104: warning: initialization discards qualifiers from pointer target type
Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Lindent rwsem.c and rwsem-spinlock.c and fix a few things by hand.  Also
added a couple of comments for the memory barriers.  Added the __sched
annotation that was left out of rwsem-spinlock.c.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

On ppc64, s64 is `long'.

In file included from fs/jfs/jfs_xtree.h:25,
                 from fs/jfs/jfs_incore.h:26,
                 from fs/jfs/super.c:29:
fs/jfs/jfs_btree.h: In function `BT_STACK_DUMP':
fs/jfs/jfs_btree.h:151: warning: long long unsigned int format, s64 arg (arg 2)

Cc: Dave Kleikamp <shaggy@austin.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Add M48T35 RTC driver for the SGI IP27 aka Origin 200, Origin 2000 and
Onyx 2.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Mostly reformatting to get the sometimes random formatting style of the LCD
driver to something Linux compliant.  Use module_init/exit for module
initialization and cleanup.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Remove #ifdef'ed hooks for the DS1286 driver through the kernel.  While
cleaning make it work as a module also and add back the core of the driver
got lost when drivers/sgi/ was shredded.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Remove old, unused initialization stuff.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

I created an ASCII NSL module manually based on the ISO-8859-1 NLS module.

This might be of use for people who do not want any charset conversion to
take place.  fs modules like vfat for example then could be forced to
display any non-ASCII character in the uni_xlate escaped form.
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>

Move the anticipatory scheduler documentation into Documentation/block.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Document the deadline scheduler and its tunables.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Convert check_region to request_region and clean up some parentheses in
return statements for drivers/cdrom/isp16.c.
Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch three issues in NUMA API

- When 1 was passed to set_mempolicy or mbind as maxnodes argument
  get_nodes could corrupt the stack and cause a crash.  Fix that.

- Remove the restriction to do interleaving only for order 0.  Together
  with the patch that went in previously to use interleaving policy at boot
  time this should give back the original behaviour of distributing the big
  hash tables.

- Fix some bad white space in comments
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

With preallocation turned on, reiserfs_allocate_blocks_for_region wasn't
sending a large enough array to hold all the blocks it was asking the block
allocator to find.  This can result in stack corruption.

The fix is to kmalloc an array to hold the blocks, making sure to allocate
something large enough.

There was also a recent optimization to force the allocator to find a free
region large enough to hold the entire preallocation size.  This was
sometimes causing more blocks to be allocated then had been requested,
which would also overflow the array.  Something more elegant is required
here, until then just disable the optimization.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>