Merge branch 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

* 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  vgacon: Add support for setting the default cursor state
  vc: Add support for hiding the cursor when creating VTs
  x86, setup: Store the boot cursor state

diff --combined Documentation/kernel-parameters.txt
index 495a39a773414878083b83287e28c5fb08d72db6,dd42eb65fd271600daeabc805323984d7c180101..777dc8a32df8d077fc9bdca101a071d3c7f97294
--- 1/Documentation/kernel-parameters.txt
--- 2/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -85,6 -85,7 +85,6 @@@ parameter is applicable
        PPT     Parallel port support is enabled.
        PS2     Appropriate PS/2 support is enabled.
        RAM     RAM disk support is enabled.
 -      ROOTPLUG The example Root Plug LSM is enabled.
        S390    S390 architecture is enabled.
        SCSI    Appropriate SCSI support is enabled.
                        A lot of drivers has their options described inside of
@@@ -344,15 -345,6 +344,15 @@@ and is between 256 and 4096 characters
                        Change the amount of debugging information output
                        when initialising the APIC and IO-APIC components.
  
 +      show_lapic=     [APIC,X86] Advanced Programmable Interrupt Controller
 +                      Limit apic dumping. The parameter defines the maximal
 +                      number of local apics being dumped. Also it is possible
 +                      to set it to "all" by meaning -- no limit here.
 +                      Format: { 1 (default) | 2 | ... | all }.
 +                      The parameter valid if only apic=debug or
 +                      apic=verbose is specified.
 +                      Example: apic=debug show_lapic=all
 +
        apm=            [APM] Advanced Power Management
                        See header of arch/x86/kernel/apm_32.c.
  
@@@ -787,13 -779,6 +787,13 @@@
                        by the set_ftrace_notrace file in the debugfs
                        tracing directory.
  
 +      ftrace_graph_filter=[function-list]
 +                      [FTRACE] Limit the top level callers functions traced
 +                      by the function graph tracer at boot up.
 +                      function-list is a comma separated list of functions
 +                      that can be changed at run time by the
 +                      set_graph_function file in the debugfs tracing directory.
 +
        gamecon.map[2|3]=
                        [HW,JOY] Multisystem joystick and NES/SNES/PSX pad
                        support via parallel port (up to 5 devices per port)
@@@ -2047,15 -2032,8 +2047,15 @@@
  
        print-fatal-signals=
                        [KNL] debug: print fatal signals
 -                      print-fatal-signals=1: print segfault info to
 -                      the kernel console.
 +
 +                      If enabled, warn about various signal handling
 +                      related application anomalies: too many signals,
 +                      too many POSIX.1 timers, fatal signals causing a
 +                      coredump - etc.
 +
 +                      If you hit the warning due to signal overflow,
 +                      you might want to try "ulimit -i unlimited".
 +
                        default: off.
  
        printk.time=    Show timing data prefixed to each printk message line
@@@ -2186,6 -2164,15 +2186,6 @@@
                        Useful for devices that are detected asynchronously
                        (e.g. USB and MMC devices).
  
 -      root_plug.vendor_id=
 -                      [ROOTPLUG] Override the default vendor ID
 -
 -      root_plug.product_id=
 -                      [ROOTPLUG] Override the default product ID
 -
 -      root_plug.debug=
 -                      [ROOTPLUG] Enable debugging output
 -
        rw              [KNL] Mount root device read-write on boot
  
        S               [KNL] Run init in single mode
@@@ -2195,8 -2182,6 +2195,8 @@@
  
        sbni=           [NET] Granch SBNI12 leased line adapter
  
 +      sched_debug     [KNL] Enables verbose scheduler debug messages.
 +
        sc1200wdt=      [HW,WDT] SC1200 WDT (watchdog) driver
                        Format: <io>[,<timeout>[,<isapnp>]]
  
@@@ -2605,9 -2590,6 +2605,9 @@@
        uart6850=       [HW,OSS]
                        Format: <io>,<irq>
  
 +      uhash_entries=  [KNL,NET]
 +                      Set number of hash buckets for UDP/UDP-Lite connections
 +
        uhci-hcd.ignore_oc=
                        [USB] Ignore overcurrent events (default N).
                        Some badly-designed motherboards generate lots of
@@@ -2747,6 -2729,15 +2747,15 @@@
                        Default is 1, i.e. UTF-8 mode is enabled for all
                        newly opened terminals.
  
+       vt.global_cursor_default=
+                       [VT]
+                       Format=<-1|0|1>
+                       Set system-wide default for whether a cursor
+                       is shown on new VTs. Default is -1,
+                       i.e. cursors will be created by default unless
+                       overridden by individual drivers. 0 will hide
+                       cursors, 1 will display them.
+ 
        waveartist=     [HW,OSS]
                        Format: <io>,<irq>,<dma>,<dma2>