From 15806528a0a224d5f99573a4bec72b6afcf0d78c Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 25 Sep 2012 09:20:48 -0700
Subject: [PATCH] --- yaml --- r: 323156 b: refs/heads/master c:
 9391734d7662019f52db42e6e2c434f81aa0d2a2 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/MAINTAINERS              | 2 ++
 trunk/include/linux/security.h | 1 +
 trunk/lib/flex_proportions.c   | 2 +-
 trunk/scripts/checksyscalls.sh | 2 +-
 5 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index cfff00d0dfea..476e8d5d0705 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 16d74ebeb1b056dfc80e69b44cc3a26515db1925
+refs/heads/master: 9391734d7662019f52db42e6e2c434f81aa0d2a2
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index b17587d9412f..1796fa3a1bc1 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -5544,6 +5544,8 @@ F:	Documentation/devicetree/bindings/pwm/
 F:	include/linux/pwm.h
 F:	include/linux/of_pwm.h
 F:	drivers/pwm/
+F:	drivers/video/backlight/pwm_bl.c
+F:	include/linux/pwm_backlight.h
 
 PXA2xx/PXA3xx SUPPORT
 M:	Eric Miao <eric.y.miao@gmail.com>
diff --git a/trunk/include/linux/security.h b/trunk/include/linux/security.h
index 3dea6a9d568f..d143b8e01954 100644
--- a/trunk/include/linux/security.h
+++ b/trunk/include/linux/security.h
@@ -118,6 +118,7 @@ void reset_security_ops(void);
 extern unsigned long mmap_min_addr;
 extern unsigned long dac_mmap_min_addr;
 #else
+#define mmap_min_addr		0UL
 #define dac_mmap_min_addr	0UL
 #endif
 
diff --git a/trunk/lib/flex_proportions.c b/trunk/lib/flex_proportions.c
index c785554f9523..ebf3bac460b0 100644
--- a/trunk/lib/flex_proportions.c
+++ b/trunk/lib/flex_proportions.c
@@ -62,7 +62,7 @@ void fprop_global_destroy(struct fprop_global *p)
  */
 bool fprop_new_period(struct fprop_global *p, int periods)
 {
-	u64 events;
+	s64 events;
 	unsigned long flags;
 
 	local_irq_save(flags);
diff --git a/trunk/scripts/checksyscalls.sh b/trunk/scripts/checksyscalls.sh
index d24810fc6af6..fd8fa9aa7c4e 100755
--- a/trunk/scripts/checksyscalls.sh
+++ b/trunk/scripts/checksyscalls.sh
@@ -200,7 +200,7 @@ EOF
 syscall_list() {
     grep '^[0-9]' "$1" | sort -n | (
 	while read nr abi name entry ; do
-	    echo <<EOF
+	    cat <<EOF
 #if !defined(__NR_${name}) && !defined(__IGNORE_${name})
 #warning syscall ${name} not implemented
 #endif