]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Auto-update from upstream
authorLen Brown <len.brown@intel.com>
Sat, 7 Jan 2006 07:05:40 +0000 (02:05 -0500)
committerLen Brown <len.brown@intel.com>
Sat, 7 Jan 2006 07:05:40 +0000 (02:05 -0500)
1  2 
Documentation/kernel-parameters.txt
MAINTAINERS

index 06e362b2d5b8bb7321cac022685bba04e9c81da7,a482fde09bbbe01756627bffb4ce3cd98ebbeed5..acb010bb087b57f57f8d984aa10061751225eff0
@@@ -910,6 -910,14 +910,14 @@@ running once the system is up
        nfsroot=        [NFS] nfs root filesystem for disk-less boxes.
                        See Documentation/nfsroot.txt.
  
+       nfs.callback_tcpport=
+                       [NFS] set the TCP port on which the NFSv4 callback
+                       channel should listen.
+       nfs.idmap_cache_timeout=
+                       [NFS] set the maximum lifetime for idmapper cache
+                       entries.
        nmi_watchdog=   [KNL,BUGS=IA-32] Debugging features for SMP kernels
  
        no387           [BUGS=IA-32] Tells the kernel to use the 387 maths
                        Limit processor to maximum C-state
                        max_cstate=9 overrides any DMI blacklist limit.
  
 +      processor.nocst [HW,ACPI]
 +                      Ignore the _CST method to determine C-states,
 +                      instead using the legacy FADT method
 +
        prompt_ramdisk= [RAM] List of RAM disks to prompt for floppy disk
                        before loading.
                        See Documentation/ramdisk.txt.
diff --combined MAINTAINERS
index a01b20ef7e8ac51609e36b624c12dc97511ef73f,bce7123d49d977490c6a9371cc7063dd4cc635b0..7e780906d34ca7daa716c4f49f6f0b8c57c4a57c
@@@ -182,7 -182,7 +182,7 @@@ S: Supporte
  ACPI
  P:    Len Brown
  M:    len.brown@intel.com
 -L:    acpi-devel@lists.sourceforge.net
 +L:    linux-acpi@vger.kernel.org
  W:    http://acpi.sourceforge.net/
  T:    git kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git
  S:    Maintained
@@@ -696,13 -696,6 +696,6 @@@ M:        pc300@cyclades.co
  W:    http://www.cyclades.com/
  S:    Supported
  
- DAC960 RAID CONTROLLER DRIVER
- P:    Dave Olien
- M     dmo@osdl.org
- W:    http://www.osdl.org/archive/dmo/DAC960
- L:    linux-kernel@vger.kernel.org
- S:    Maintained
  DAMA SLAVE for AX.25
  P:    Joerg Reuter
  M:    jreuter@yaina.de
@@@ -2923,6 -2916,12 +2916,12 @@@ W:    http://linuxtv.or
  T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
  S:    Maintained
  
+ VT8231 HARDWARE MONITOR DRIVER
+ P:    Roger Lucas
+ M:    roger@planbit.co.uk
+ L:    lm-sensors@lm-sensors.org
+ S:    Maintained
  W1 DALLAS'S 1-WIRE BUS
  P:    Evgeniy Polyakov
  M:    johnpol@2ka.mipt.ru