---

yaml
---
r: 130107
b: refs/heads/master
c: c275ce4
h: refs/heads/master
i:
  130105: 7b4615a
  130103: e785a21
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf50c903faba4ec7686ee8a570ac384b0f20814d
+refs/heads/master: c275ce44929402664902cbb09d4f054b315623d7

trunk/Documentation/kernel-parameters.txt

@@ -577,6 +577,9 @@ and is between 256 and 4096 characters. It is defined in the file
 			a memory unit (amount[KMG]). See also
 			Documentation/kdump/kdump.txt for a example.
 
+	cs4232=		[HW,OSS]
+			Format: <io>,<irq>,<dma>,<dma2>,<mpuio>,<mpuirq>
+
 	cs89x0_dma=	[HW,NET]
 			Format: <dma>
 
@@ -729,6 +732,10 @@ and is between 256 and 4096 characters. It is defined in the file
 			Default value is 0.
 			Value can be changed at runtime via /selinux/enforce.
 
+	es1371=		[HW,OSS]
+			Format: <spdif>,[<nomix>,[<amplifier>]]
+			See also header of sound/oss/es1371.c.
+
 	ether=		[HW,NET] Ethernet cards parameters
 			This option is obsoleted by the "netdev=" option, which
 			has equivalent usage. See its documentation for details.

trunk/Documentation/sound/alsa/HD-Audio-Models.txt

@@ -349,7 +349,6 @@ STAC92HD73*
 STAC92HD83*
 ===========
   ref		Reference board
-  mic-ref	Reference board with power managment for ports
 
 STAC9872
 ========

trunk/Makefile

@@ -213,10 +213,6 @@ endif
 # Where to locate arch specific headers
 hdr-arch  := $(SRCARCH)
 
-ifeq ($(ARCH),m68knommu)
-       hdr-arch  := m68k
-endif
-
 KCONFIG_CONFIG	?= .config
 
 # SHELL used by kbuild

trunk/arch/arm/plat-mxc/include/mach/irqs.h

@@ -35,15 +35,7 @@
 #define MXC_BOARD_IRQ_START	(MXC_INTERNAL_IRQS + MXC_GPIO_IRQS)
 #define MXC_BOARD_IRQS	16
 
-#define MXC_IPU_IRQ_START	(MXC_BOARD_IRQ_START + MXC_BOARD_IRQS)
-
-#ifdef CONFIG_MX3_IPU_IRQS
-#define MX3_IPU_IRQS CONFIG_MX3_IPU_IRQS
-#else
-#define MX3_IPU_IRQS 0
-#endif
-
-#define NR_IRQS			(MXC_IPU_IRQ_START + MX3_IPU_IRQS)
+#define NR_IRQS		(MXC_BOARD_IRQ_START + MXC_BOARD_IRQS)
 
 extern void imx_irq_set_priority(unsigned char irq, unsigned char prio);