This is from Ben Herrenschmidt's tree.

into samba.org:/home/paulus/kernel/for-linus-ppc

into samba.org:/home/paulus/kernel/for-linus-ppc

into samba.org:/home/paulus/kernel/for-linus-ppc

This moves the uc_sigmask field back to where it was before.  We now don't
assume the registers are at a fixed offset in the ucontext, but instead
access them through the uc_regs field as in the past.  This corresponds with
a recent change in glibc CVS.

This is a new patch that includes Martin's, and makes create_dir() return
an int. That matches sysfs_create_file(), and saves a couple of
conversions back and forth between pointer and error.

avoid an annoying nonsense configuration question.

 - Remove obsolete wrong do_magic prototype
 - Remove the dependency between ACPI_SLEEP and SOFTWARE_SUSPEND
   some people complained about. Works the same as i386 now.
 - Fix another gcc 3.3 warning in reboot.c
 - Default NMI watchdog to LOCAL_APIC because that works on more
   boxes

From: Domen Puncer <domen@coderock.org>

From: Randy Hron <rwhron@earthlink.net>

Remove duplicate #includes from fs/intermezzo.

From: Domen Puncer <domen@coderock.org>

The verify_area's are not needed.

From: Randy Hron <rwhron@earthlink.net>

Remove unnecessary include of version.h in drivers/tc/

From: Domen Puncer <domen@coderock.org>

verify_area isn't needed.

From: Domen Puncer <domen@coderock.org>

Drop verify_area, using copy*user already (instead).
Also user -EFAULT for error instead of -EINVAL.

From: maximilian attems <janitor@sternwelten.at>

this patches catches obvious mistyping of new line:
/n versus \n
adds a printk loglevel to one of the erroneous lines

From: Domen Puncer <domen@coderock.org>

From: Randy Hron <rwhron@earthlink.net>

Remove duplicate #includes in fs/
Remove version.h includes where they aren't necessary.
Test compiled on 2.6.0-test5-bk9.

From: Domen Puncer <domen@coderock.org>

Deleted unneeded verify_area calls.
Also commented a label.

From: Domen Puncer <domen@coderock.org>

Use get_user/put_user to check user addressing,
don't need to use verify_area also.

into home.osdl.org:/home/torvalds/v2.5/linux

into home.osdl.org:/home/torvalds/v2.5/linux

Remove outdated ipl records from arch/s390/boot. They are now part of
the s390-tools package.

s390 documentation changes.

Add support for vt220 console over sclp.

 - Create symlinks between netdev and groupdev.
 - Remove initialization of device.name.
 - Call qeth_free_card on removal.
 - Remove async hsi.
 - Remove contig memusage.
 - Add check for -EFAULT to copy_from_user/copy_to_user.
 - Inlining some functions to save kernel stack space.
 - vlan header fixes.
 - Replace atomic_return_sub with atomic_add_return.

 - Add type and timeout attribute.
 - Create symlinks between netdev and groupdev.
 - Remove initialization of device.name.

 - Move iucv bus and root device initialization from netiucv to iucv.
 - Fix race condition in iucv_connect.
 - Add 'user' attribute to netiucv driver.

 - Add type attribute.
 - Remove initialization of device.name.
 - Remove unnecessary include.

 - Fix use of tape block request queue pointer.
 - Remove unnecessary includes.

Fix bug in CMS label recognition in ibm.c

 - Do add_disk even for unformatted devices to be able to format them.
 - Remove initialization of device.name.
 - Export some functions.

 - Make xpram work on 64 bit machines.
 - Use new-style module_param.

 - Use common drivers/block/Kconfig instead of own config options, move
   s390 block device config options to drivers/s390/block/Kconfig and
   include it from drivers/block/Kconfig.
 - Fix configuration combination CONFIG_IPV6=m and CONFIG_QETH=y.
 - New default configuration.

Make use of sysfs_create_group in s390 device drivers.

Fix restarting of system calls done by use of the execute instruction.