Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (49 commits)
  [ARM] idle: clean up pm_idle calling, obey hlt_counter
  [ARM] S3C: Fix gpio-config off-by-one bug
  [ARM] S3C64XX: add to_irq() support for EINT() GPIO
  [ARM] S3C64XX: clock.c: fix typo in usb-host clock ctrlbit
  [ARM] S3C64XX: fix HCLK gate defines
  [ARM] Update mach-types
  [ARM] wire up rt_tgsigqueueinfo and perf_counter_open
  OMAP2 clock/powerdomain: off by 1 error in loop timeout comparisons
  OMAP3 SDRC: set FIXEDDELAY when disabling SDRC DLL
  OMAP3: Add support for DPLL3 divisor values higher than 2
  OMAP3 SRAM: convert SRAM code to use macros rather than magic numbers
  OMAP3 SRAM: add more comments on the SRAM code
  OMAP3 clock/SDRC: program SDRC_MR register during SDRC clock change
  OMAP3 clock: add a short delay when lowering CORE clk rate
  OMAP3 clock: initialize SDRC timings at kernel start
  OMAP3 clock: remove wait for DPLL3 M2 clock to stabilize
  [ARM] Add old Feroceon support to compressed/head.S
  [ARM] 5559/1: Limit the stack unwinding caused by a kthread exit
  [ARM] 5558/1: Add extra checks to ARM unwinder to avoid tracing corrupt stacks
  [ARM] 5557/1: Discard some ARM.ex*.*exit.text sections when !HOTPLUG or !HOTPLUG_CPU
  ...

diff --combined Documentation/kernel-parameters.txt
index 7da0899d1fb9100c383e15385dd95faaa452c9a3,96230a638e1bbcea442c4cf9c5b72a42fa0c27f4..5092a2be83c57b5ebb3d1de05493b5f7a9c36ce4
--- 1/Documentation/kernel-parameters.txt
--- 2/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -48,7 -48,6 +48,7 @@@ parameter is applicable
        EFI     EFI Partitioning (GPT) is enabled
        EIDE    EIDE/ATAPI support is enabled.
        FB      The frame buffer device is enabled.
 +      GCOV    GCOV profiling is enabled.
        HW      Appropriate hardware is enabled.
        IA-64   IA-64 architecture is enabled.
        IMA     Integrity measurement architecture is enabled.
@@@ -797,12 -796,6 +797,12 @@@ and is between 256 and 4096 characters
                        Format: off | on
                        default: on
  
 +      gcov_persist=   [GCOV] When non-zero (default), profiling data for
 +                      kernel modules is saved and remains accessible via
 +                      debugfs, even when the module is unloaded/reloaded.
 +                      When zero, profiling data is discarded and associated
 +                      debugfs files are removed at module unload time.
 +
        gdth=           [HW,SCSI]
                        See header of drivers/scsi/gdth.c.
  
@@@ -1369,6 -1362,27 +1369,27 @@@
        min_addr=nn[KMG]        [KNL,BOOT,ia64] All physical memory below this
                        physical address is ignored.
  
+       mini2440=       [ARM,HW,KNL]
+                       Format:[0..2][b][c][t]
+                       Default: "0tb"
+                       MINI2440 configuration specification:
+                       0 - The attached screen is the 3.5" TFT
+                       1 - The attached screen is the 7" TFT
+                       2 - The VGA Shield is attached (1024x768)
+                       Leaving out the screen size parameter will not load
+                       the TFT driver, and the framebuffer will be left
+                       unconfigured.
+                       b - Enable backlight. The TFT backlight pin will be
+                       linked to the kernel VESA blanking code and a GPIO
+                       LED. This parameter is not necessary when using the
+                       VGA shield.
+                       c - Enable the s3c camera interface.
+                       t - Reserved for enabling touchscreen support. The
+                       touchscreen support is not enabled in the mainstream
+                       kernel as of 2.6.30, a preliminary port can be found
+                       in the "bleeding edge" mini2440 support kernel at
+                       http://repo.or.cz/w/linux-2.6/mini2440.git
+ 
        mminit_loglevel=
                        [KNL] When CONFIG_DEBUG_MEMORY_INIT is set, this
                        parameter allows control of the logging verbosity for
@@@ -1776,9 -1790,6 +1797,9 @@@
                                root domains (aka PCI segments, in ACPI-speak).
                nommconf        [X86] Disable use of MMCONFIG for PCI
                                Configuration
 +              check_enable_amd_mmconf [X86] check for and enable
 +                              properly configured MMIO access to PCI
 +                              config space on AMD family 10h CPU
                nomsi           [MSI] If the PCI_MSI kernel config parameter is
                                enabled, this kernel boot option can be used to
                                disable the use of MSI interrupts system-wide.
@@@ -1831,7 -1842,7 +1852,7 @@@
                                IRQ routing is enabled.
                noacpi          [X86] Do not use ACPI for IRQ routing
                                or for PCI scanning.
 -              use_crs         [X86] Use _CRS for PCI resource
 +              nocrs           [X86] Don't use _CRS for PCI resource
                                allocation.
                routeirq        Do IRQ routing for all PCI devices.
                                This is normally done in pci_enable_device(),
@@@ -1868,12 -1879,6 +1889,12 @@@
                                PAGE_SIZE is used as alignment.
                                PCI-PCI bridge can be specified, if resource
                                windows need to be expanded.
 +              ecrc=           Enable/disable PCIe ECRC (transaction layer
 +                              end-to-end CRC checking).
 +                              bios: Use BIOS/firmware settings. This is the
 +                              the default.
 +                              off: Turn ECRC off
 +                              on: Turn ECRC on.
  
        pcie_aspm=      [PCIE] Forcibly enable or disable PCIe Active State Power
                        Management.

diff --combined MAINTAINERS
index b114632050bf0a3185ee6582510744f76cf8ce9c,e53c1c566caf83f20aa47e1e4b13dd5bd67fdee4..cf5a46ef6b3f4ae57562cf8bf6de23d3623386ad
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -653,6 -653,8 +653,8 @@@ M: [email protected]
  L:    [email protected] (subscribers-only)
  W:    http://www.openezx.org/
  S:    Maintained
+ T:    topgit git://git.openezx.org/openezx.git
+ F:    arch/arm/mach-pxa/ezx.c
  
  ARM/FARADAY FA526 PORT
  P:    Paulius Zaleckas
@@@ -774,11 -776,25 +776,25 @@@ P:      Philipp Zabe
  M:    [email protected]
  S:    Maintained
  
+ ARM/MIOA701 MACHINE SUPPORT
+ P:    Robert Jarzmik
+ M:    [email protected]
+ L:    [email protected] (subscribers-only)
+ F:    arch/arm/mach-pxa/mioa701.c
+ S:    Maintained
+ 
  ARM/NEC MOBILEPRO 900/c MACHINE SUPPORT
  P:    Michael Petchkovsky
  M:    [email protected]
  S:    Maintained
  
+ ARM/OPENMOKO NEO FREERUNNER (GTA02) MACHINE SUPPORT
+ P:    Nelson Castillo
+ M:    [email protected]
+ L:    [email protected] (subscribers-only)
+ W:    http://wiki.openmoko.org/wiki/Neo_FreeRunner
+ S:    Supported
+ 
  ARM/TOSA MACHINE SUPPORT
  P:    Dmitry Eremin-Solenikov
  M:    [email protected]
@@@ -792,6 -808,12 +808,12 @@@ M:       [email protected]
  W:    http://hackndev.com
  S:    Maintained
  
+ ARM/PALM TREO 680 SUPPORT
+ P:    Tomas Cech
+ M:    [email protected]
+ W:    http://hackndev.com
+ S:    Maintained
+ 
  ARM/PALMZ72 SUPPORT
  P:    Sergey Lapin
  M:    [email protected]
@@@ -946,7 -968,7 +968,7 @@@ M: [email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 -F:    drivers/net/wireless/ath5k/
 +F:    drivers/net/wireless/ath/ath5k/
  
  ATHEROS ATH9K WIRELESS DRIVER
  P:    Luis R. Rodriguez
@@@ -962,7 -984,7 +984,7 @@@ M: [email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Supported
 -F:    drivers/net/wireless/ath9k/
 +F:    drivers/net/wireless/ath/ath9k/
  
  ATHEROS AR9170 WIRELESS DRIVER
  P:    Christian Lamparter
@@@ -970,7 -992,7 +992,7 @@@ M: [email protected]
  L:    [email protected]
  W:    http://wireless.kernel.org/en/users/Drivers/ar9170
  S:    Maintained
 -F:    drivers/net/wireless/ar9170/
 +F:    drivers/net/wireless/ath/ar9170/
  
  ATI_REMOTE2 DRIVER
  P:    Ville Syrjala
@@@ -1010,13 -1032,6 +1032,13 @@@ W:    http://www.at91.com
  S:    Maintained
  F:    drivers/mmc/host/at91_mci.c
  
 +ATMEL AT91 / AT32 MCI DRIVER
 +P:    Nicolas Ferre
 +M:    [email protected]
 +S:    Maintained
 +F:    drivers/mmc/host/atmel-mci.c
 +F:    drivers/mmc/host/atmel-mci-regs.h
 +
  ATMEL AT91 / AT32 SERIAL DRIVER
  P:    Haavard Skinnemoen
  M:    [email protected]
@@@ -1551,7 -1566,6 +1573,7 @@@ L:      [email protected]
  S:    Maintained
  F:    include/linux/cgroup*
  F:    kernel/cgroup*
 +F:    mm/*cgroup*
  
  CORETEMP HARDWARE MONITORING DRIVER
  P:    Rudolf Marek
@@@ -2060,8 -2074,8 +2082,8 @@@ F:      drivers/edac/i5400_edac.
  
  EDAC-I82975X
  P:    Ranganathan Desikan
 -P:    Arvind R.
  M:    [email protected]
 +P:    Arvind R.
  M:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  W:    bluesmoke.sourceforge.net
@@@ -2282,9 -2296,11 +2304,9 @@@ F:     drivers/net/wan/dlci.
  F:    drivers/net/wan/sdla.c
  
  FRAMEBUFFER LAYER
 -P:    Antonino Daplas
 -M:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  W:    http://linux-fbdev.sourceforge.net/
 -S:    Maintained
 +S:    Orphan
  F:    Documentation/fb/
  F:    drivers/video/fb*
  F:    include/linux/fb.h
@@@ -2397,7 -2413,7 +2419,7 @@@ FTRAC
  P:    Steven Rostedt
  M:    [email protected]
  S:    Maintained
 -F:    Documentation/ftrace.txt
 +F:    Documentation/trace/ftrace.txt
  F:    arch/*/*/*/ftrace.h
  F:    arch/*/kernel/ftrace.c
  F:    include/*/ftrace.h
@@@ -2853,10 -2869,10 +2875,10 @@@ P:   Sergey Lapi
  M:    [email protected]
  L:    [email protected]
  W:    http://apps.sourceforge.net/trac/linux-zigbee
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lumag/lowpan.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lowpan/lowpan.git
  S:    Maintained
  F:    net/ieee802154/
 -F:    drivers/ieee801254/
 +F:    drivers/ieee802154/
  
  INTEGRITY MEASUREMENT ARCHITECTURE (IMA)
  P:    Mimi Zohar
@@@ -3413,7 -3429,7 +3435,7 @@@ P:      Eduard - Gabriel Muntean
  M:    [email protected]
  S:    Maintained
  F:    Documentation/trace/kmemtrace.txt
 -F:    include/trace/kmemtrace.h
 +F:    include/linux/kmemtrace.h
  F:    kernel/trace/kmemtrace.c
  
  KPROBES
@@@ -4090,7 -4106,7 +4112,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    net/wireless/
  F:    include/net/ieee80211*
 -F:    include/net/wireless.h
 +F:    include/linux/wireless.h
  
  NETWORKING DRIVERS
  L:    [email protected]
@@@ -4584,13 -4600,6 +4606,13 @@@ S:    Maintaine
  F:    drivers/net/pppol2tp.c
  F:    include/linux/if_pppol2tp.h
  
 +PPS SUPPORT
 +P:    Rodolfo Giometti
 +M:    [email protected]
 +W:    http://wiki.enneenne.com/index.php/LinuxPPS_support
 +L:    [email protected] (subscribers-only)
 +S:    Maintained
 +
  PREEMPTIBLE KERNEL
  P:    Robert Love
  M:    [email protected]
@@@ -5101,13 -5110,6 +5123,13 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/mmc/host/sdhci.*
  
 +SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) SAMSUNG DRIVER
 +P:    Ben Dooks
 +M:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/mmc/host/sdhci-s3c.c
 +
  SECURITY SUBSYSTEM
  P:    James Morris
  M:    [email protected]
@@@ -5493,7 -5495,6 +5515,7 @@@ STAGING SUBSYSTE
  P:    Greg Kroah-Hartman
  M:    [email protected]
  T:    quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
 +L:    [email protected]
  S:    Maintained
  F:    drivers/staging/
  
@@@ -6230,14 -6231,6 +6252,14 @@@ S:    Maintaine
  F:    Documentation/i2c/busses/i2c-viapro
  F:    drivers/i2c/busses/i2c-viapro.c
  
 +VIA SD/MMC CARD CONTROLLER DRIVER
 +P:    Joseph Chan
 +M:    [email protected]
 +P:    Harald Welte
 +M:    [email protected]
 +S:    Maintained
 +F:    drivers/mmc/host/via-sdmmc.c
 +
  VIA UNICHROME(PRO)/CHROME9 FRAMEBUFFER DRIVER
  P:    Joseph Chan
  M:    [email protected]