---

yaml --- r: 284235 b: refs/heads/master c: 7b21e34 h: refs/heads/master i: 284233: 0ee9635 284231: 26dbddc v: v3
git-mirror · Jan 12, 2012 · 4582e9e · 4582e9e
1 parent da36581
commit 4582e9e
Show file tree

Hide file tree

Showing 929 changed files with 23,407 additions and 51,318 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 61bd5e5683244a564ecfe31c73575ee0bc708ccc
+refs/heads/master: 7b21e34fd1c272e3a8c3846168f2f6287a4cd72b
diff --git a/trunk/Documentation/DocBook/writing-an-alsa-driver.tmpl b/trunk/Documentation/DocBook/writing-an-alsa-driver.tmpl
@@ -404,7 +404,7 @@
   /* SNDRV_CARDS: maximum number of cards supported by this module */
   static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
   static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;
-  static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
+  static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
 
   /* definition of the chip-specific record */
   struct mychip {

diff --git a/trunk/Documentation/devicetree/bindings/power_supply/olpc_battery.txt b/trunk/Documentation/devicetree/bindings/power_supply/olpc_battery.txt
diff --git a/trunk/Documentation/devicetree/bindings/power_supply/sbs_sbs-battery.txt b/trunk/Documentation/devicetree/bindings/power_supply/sbs_sbs-battery.txt
diff --git a/trunk/Documentation/devicetree/bindings/sound/tegra-audio-wm8903.txt b/trunk/Documentation/devicetree/bindings/sound/tegra-audio-wm8903.txt
diff --git a/trunk/Documentation/devicetree/bindings/sound/tegra20-das.txt b/trunk/Documentation/devicetree/bindings/sound/tegra20-das.txt
diff --git a/trunk/Documentation/devicetree/bindings/sound/tegra20-i2s.txt b/trunk/Documentation/devicetree/bindings/sound/tegra20-i2s.txt
diff --git a/trunk/Documentation/devicetree/bindings/sound/wm8903.txt b/trunk/Documentation/devicetree/bindings/sound/wm8903.txt
diff --git a/trunk/Documentation/devicetree/bindings/sound/wm8994.txt b/trunk/Documentation/devicetree/bindings/sound/wm8994.txt
diff --git a/trunk/Documentation/devicetree/bindings/vendor-prefixes.txt b/trunk/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -34,13 +34,11 @@ powervr	Imagination Technologies
 qcom	Qualcomm, Inc.
 ramtron	Ramtron International
 samsung	Samsung Semiconductor
-sbs	Smart Battery System
 schindler	Schindler
 sil	Silicon Image
 simtek
 sirf	SiRF Technology, Inc.
 st	STMicroelectronics
 stericsson	ST-Ericsson
 ti	Texas Instruments
-wlf	Wolfson Microelectronics
 xlnx	Xilinx
diff --git a/trunk/Documentation/digsig.txt b/trunk/Documentation/digsig.txt
diff --git a/trunk/Documentation/feature-removal-schedule.txt b/trunk/Documentation/feature-removal-schedule.txt
@@ -544,15 +544,3 @@ When:	3.5
 Why:	The iwlagn module has been renamed iwlwifi.  The alias will be around
 	for backward compatibility for several cycles and then dropped.
 Who:	Don Fry <donald.h.fry@intel.com>
-
-----------------------------
-
-What:	pci_scan_bus_parented()
-When:	3.5
-Why:	The pci_scan_bus_parented() interface creates a new root bus.  The
-	bus is created with default resources (ioport_resource and
-	iomem_resource) that are always wrong, so we rely on arch code to
-	correct them later.  Callers of pci_scan_bus_parented() should
-	convert to using pci_scan_root_bus() so they can supply a list of
-	bus resources when the bus is created.
-Who:	Bjorn Helgaas <bhelgaas@google.com>
diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt
@@ -1824,10 +1824,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 	nomfgpt		[X86-32] Disable Multi-Function General Purpose
 			Timer usage (for AMD Geode machines).
 
-	nonmi_ipi	[X86] Disable using NMI IPIs during panic/reboot to
-			shutdown the other cpus.  Instead use the REBOOT_VECTOR
-			irq.
-
 	nopat		[X86] Disable PAT (page attribute table extension of
 			pagetables) support.
 
@@ -2399,12 +2395,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 
 	slram=		[HW,MTD]
 
-	slab_max_order=	[MM, SLAB]
-			Determines the maximum allowed order for slabs.
-			A high setting may cause OOMs due to memory
-			fragmentation.  Defaults to 1 for systems with
-			more than 32MB of RAM, 0 otherwise.
-
 	slub_debug[=options[,slabs]]	[MM, SLUB]
 			Enabling slub_debug allows one to determine the
 			culprit if slab objects become corrupted. Enabling