commit ed313489badef16d700f5a3be50e8fd8f8294bc8
Merge: 13d428a... 28105fd...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Thu Nov 20 18:08:09 2008 -0800

    Merge master.kernel.org:/home/rmk/linux-2.6-arm
    
    * master.kernel.org:/home/rmk/linux-2.6-arm:
      [ARM] 5330/1: mach-pxa: Fixup reset for systems using reboot=cold or other strings
      [ARM] pxa: fix incorrect PCMCIA PSKTSEL pin configuration for spitz
      [ARM] pxa: fix I2C controller device being registered twice on Akita
      pxafb: only initialize the smart panel thread when dealing with a smartpanel
      pxafb: introduce LCD_TYPE_MASK and use it.

commit 28105fda1ecadfa7c827b22d323c169f19dc04b0
Author: Jaya Kumar <jayakumar.lkml@gmail.com>
Date:   Tue Nov 11 12:17:05 2008 +0100

    [ARM] 5330/1: mach-pxa: Fixup reset for systems using reboot=cold or other strings
    
    This patch makes do_hw_reset the default reboot behavior when nothing
    else matches. This restores reboot functionality on gumstix basix
    devices where reboot=cold is the default boot argument.
    
    Signed-off-by: Jaya Kumar <jayakumar.lkml@gmail.com>
    Acked-by: Eric Miao <eric.miao@marvell.com>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

commit 12a8ab152d6b0c9f697d0f2bd423001ed3fd360b
Merge: e14c8bf... faf2f0a...
Author: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date:   Mon Nov 17 10:45:03 2008 +0000

    Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6

commit faf2f0ab13d259f2386d156d24c405ec8cee30ff
Author: Eric Miao <eric.miao@marvell.com>
Date:   Sun Nov 16 15:56:58 2008 +0800

    [ARM] pxa: fix incorrect PCMCIA PSKTSEL pin configuration for spitz
    
    The original incorrect configuration caused GPIO79_nCS_3 being overriden,
    thus resulted in the NAND flash not being detected. The real PSKTSEL pin
    is on GPIO104 instead of GPIO79.
    
    Signed-off-by: Eric Miao <eric.miao@marvell.com>
    Cc: Richard Purdie <rpurdie@rpsys.net>

commit 38cd809e675e29ea1c3bce8ed743b0fe8aa10eea
Author: Eric Miao <eric.miao@marvell.com>
Date:   Sat Nov 15 23:41:56 2008 +0800

    [ARM] pxa: fix I2C controller device being registered twice on Akita
    
    Signed-off-by: Eric Miao <eric.miao@marvell.com>
    Cc: Richard Purdie <rpurdie@rpsys.net>

commit 6cc4abe43e9362034881ad8c005f4ab8a684ae3e
Author: Eric Miao <eric.miao@marvell.com>
Date:   Tue Nov 11 21:47:07 2008 +0800

    pxafb: only initialize the smart panel thread when dealing with a smartpanel
    
    Signed-off-by: Daniel Mack <daniel@caiaq.de>
    Signed-off-by: Eric Miao <eric.miao@marvell.com>

commit 1ec26db1f8cae0aca64708e0fe1f687eab7c82e5
Author: Eric Miao <eric.miao@marvell.com>
Date:   Tue Nov 11 21:45:57 2008 +0800

    pxafb: introduce LCD_TYPE_MASK and use it.
    
    Signed-off-by: Daniel Mack <daniel@caiaq.de>
    Signed-off-by: Eric Miao <eric.miao@marvell.com>