---

yaml
---
r: 105247
b: refs/heads/master
c: 15e8f34
h: refs/heads/master
i:
  105245: 48748bb
  105243: 859e371
  105239: c249f0d
  105231: 1dd46c4
  105215: f6ea963
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f9dce38378f0a4a298e885553d6bb7121376376
+refs/heads/master: 15e8f348db372dec21229fda5d52ae6ee7e64666

trunk/Documentation/kernel-parameters.txt

@@ -2034,9 +2034,6 @@ and is between 256 and 4096 characters. It is defined in the file
 
 	snd-ymfpci=	[HW,ALSA]
 
-	softlockup_panic=
-			[KNL] Should the soft-lockup detector generate panics.
-
 	sonypi.*=	[HW] Sony Programmable I/O Control Device driver
 			See Documentation/sonypi.txt
 

trunk/MAINTAINERS

@@ -480,28 +480,11 @@ M:	kernel@wantstofly.org
 L:	linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 S:	Maintained
 
-ARM/COMPULAB CM-X270/EM-X270 MACHINE SUPPORT
-P:	Mike Rapoport
-M:	mike@compulab.co.il
-L:	linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
-S:	Maintained
-
 ARM/CORGI MACHINE SUPPORT
 P:	Richard Purdie
 M:	rpurdie@rpsys.net
 S:	Maintained
 
-ARM/EZX SMARTPHONES (A780, A910, A1200, E680, ROKR E2 and ROKR E6)
-P:	Daniel Ribeiro
-M:	drwyrm@gmail.com
-P:	Stefan Schmidt
-M:	stefan@openezx.org
-P:	Harald Welte
-M:	laforge@openezx.org
-L:	openezx-devel@lists.openezx.org (subscribers-only)
-W:	http://www.openezx.org/
-S:	Maintained
-
 ARM/GLOMATION GESBC9312SX MACHINE SUPPORT
 P:	Lennert Buytenhek
 M:	kernel@wantstofly.org
@@ -589,18 +572,10 @@ L:	linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 S:	Maintained
 
 ARM/TOSA MACHINE SUPPORT
-P:	Dmitry Baryshkov
-M:	dbaryshkov@gmail.com
 P:	Dirk Opfer
 M:	dirk@opfer-online.de
 S:	Maintained
 
-ARM/PALMTX SUPPORT
-P:	Marek Vasut
-M:	marek.vasut@gmail.com
-W:	http://hackndev.com
-S:	Maintained
-
 ARM/PLEB SUPPORT
 P:	Peter Chubb
 M:	pleb@gelato.unsw.edu.au

trunk/arch/arm/common/sa1111.c

@@ -627,7 +627,7 @@ __sa1111_probe(struct device *me, struct resource *mem, int irq)
 	if (!sachip)
 		return -ENOMEM;
 
-	sachip->clk = clk_get(me, "SA1111_CLK");
+	sachip->clk = clk_get(me, "GPIO27_CLK");
 	if (!sachip->clk) {
 		ret = PTR_ERR(sachip->clk);
 		goto err_free;