Patch from Dave Jiang

Clean up iop3xx timer routines and move to xtime_lock/timer_tick schemes
dependent on patch 2216/1

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

Patch from Ben Dooks

Add a system device for the s3c2440 called s3c2440-core
to allow power management hooks for s3c2440 specific
registers to be added.

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

Patch from Ben Dooks

This patch does the following:

 - Save S3C2410_DCLKCON over sleep
 - Save all non-SDRAM memory bank config
 - Fix bug in setting PLL before clock divisor
 - Save all IRQ level controlls
 - Restore IRQ masks _after_ configuration restored
 - No debug until core registers restored

This patch also moves the pm save/restore list code
into the header, for other parts of arch/arm/mach-s3c2410
to use. Note, this is not a general invite for external
code to use these functions.

Also applied patch from Dimitry Andric to fix up the
spelling/typos in Documentation/arm/Samsung-S3C24XX/Suspend.txt

Signed-off-by: Ben Dooks 

Signed-off-by: Dimitry Andric 
Signed-off-by: Russell King

Patch from Ben Dooks

The following fixes are included:

 - fix the addresses of S3C2440_DSCx (off by 4)
 - SCK0/SCK1 definitions the wrong way around
 - renable ENABLE to DISABLE

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

- if alarm operations are NULL, don't allow alarm ioctls to succeed.
- if ops->ioctl is NULL, don't try to call NULL function.
- only display the alarm times in /proc/rtc if we successfully read
  the alarm time.

Patch from Ian Campbell

As discussed on the ARM Linux kernel mailing list. With edge triggered interrupts it is impossible to avoid spurious interrupts and so it makes sense to just ignore IRQ_NONE return values in this case. 

Signed-off-by: Ian Campbell 
Signed-off-by: Russell King

Patch from Dave Jiang

Updates the timer irqs to call the new update process time scheme

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

Patch from Ben Dooks

Added S3C2440_IICLC register definitions

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

Patch from George G. Davis

Recent gcc-4.0 and gcc-csl-arm-branch tool chains no longer include support
for apcs-32 and alignment-traps command line options. This patch tests
for presence of these deprecated c/l options and uses new gcc-4.0 c/l
options instead if they are not supported by the current toolchain.

Signed-off-by: George G. Davis 
Signed-off-by: Russell King

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

If you call drivers/md/dm-io.c:resize_pool on an empty pool and
mempool_create is unable to make the pool, the condition is not handled
correctly, resulting in an oops in mempool_destroy.

Trivial fix.

Minor changes required to port kprobes for sparc64.

- arch_prepare_kprobe() returns an integer.

- added arch_remove_kprobe().

- changes to access copy of original instruction, since kprobe_opcode_t
  insn[MAX_INSN_SIZE] is moved from struct kprobe to a struct
  arch_specific_insn.
Signed-off-by: Prasanna S Panchamukhi <prasanna@in.ibm.com>
Cc: "David S. Miller" <davem@davemloft.net>
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

released the tasklist_lock.

Since it released the lock, the process lists may not
be valid any more, and we must repeat the loop rather than
continue with the next parent.

Use -EAGAIN to show this condition (separate from the
normal -EFAULT that may happen if rusage information could
not be copied to user space).

into kroah.com:/home/greg/linux/BK/i2c-2.6

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

This patch integrates several fixes to the s3c2410 i2c
driver

Shannon Holland:

	- write IICCON in configuration code
	- add handling for s3c2410 i2c errata
	- fix clock rate divisor calculation

Ben Dooks:

	- s3c2440 detection
	- s3c2440 IICLC register setup
	- add __exit to the module exit
	- remove return from exit code
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Shannon Holland <holland@loser.net>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

The patch below makes some needlessly global code under i2c/busses/
static.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

The patch adds a check at the beginning of i2c_del_adapter in case
someone attempts to remove an adapter that was never added in the first
place. This sounds like a good safety, as doing so will lead to an oops
at the moment. Also, I have a need for it in the latest version of my
i2c-amd756-s4882 patch. I need to remove the original adapter and
install the virtual ones instead, but I have no way to know if the
original adapter was succesfully added beforehand or not.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Signed-off-by: Justin Thiessen <jthiessen@penguincomputing.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

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

In big endian machines, the read*/write* accessors do a byteswap for an
inherently little endian PCI bus.  However, rivafb puts the hardwire in big
endian register access, thus the byteswap is not needed. So for 16- and
32-bit access, instead of read*/write*, use __raw_read*/__raw_write* for all
archs.
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Typo introduced by latest cleanups by Antonino

At unload i8042 sets panic_blink to 0.  This will cause problems if kernel
panics later as it will just use it assuming that the pointer is correct.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The patch below fixes two flaws in minix_clear_inode.

The first is that it tests bh which is never initialized.  (&bh is a
parameter of minix_V1_raw_inode, but that routine can fail and return
before it has set bh)

The second is that generic_delete_inode() goes BUG() in case inode->i_state
!= I_CLEAR.  Clearly, it is expected that inode->i_sb->s_op->delete_inode
does a clear_inode() at some point.  But minix_delete_inode() calls
minix_free_inode() and that routine can print an error and return early,
before calling clear_inode().
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Peter Osterlund <petero2@telia.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

ppdev's ioctls are not available for 32bit apps on 64bit systems.  There
are four ioctls which take no argument at all (so they are compatible
between 32bit and 64bit), these numbers do not clash with any other ioctl
code, and so I see no reason why not applying patch below.

It solves problem VMware users are faced on 64bit systems if they want to
use direct access to the parallel port.
Signed-off-by: Petr Vandrovec <vandrove@vc.cvut.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Although it was checking the per-character error flags supplied by the
driver for ordinary characters, the ppp_async line discipline code wasn't
checking the flags for special characters, such as the flag and escape
characters (~ and }).  This patch adds that check.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

ia64 and ppc64 have function descriptors.  Booting with initcall_debug will
print the descriptor address, not the address and name of the actual
function.  Another indirection is required.

Tested on ppc, ppc64 and ia64.
Signed-off-by: Olaf Hering <olh@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

When your plug-n-play BIOS is truly broken and generates a fault during
use, we report this and suggest disabling it.  The message produced
suggests using "nobiospnp" to achive this, the correct option is
"pnpbios=off".  This patch upates the message.
Signed-off-by: Andy Whitcroft <apw@shadowen.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The following adds a __KERNEL__ check to <linux/crc-ccitt.h>.  The problem
is that the ppp package includes <linux/ppp_defs.h> via <net/ppp_defs.h>,
which in turn gets <linux/crc-ccitt.h>.
Signed-off-by: Tom Rini <trini@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>