Merge branch 'akpm' (patches from Andrew Morton)

Merge second patch-bomb from Andrew Morton:
 - a few hotfixes
 - drivers/dma updates
 - MAINTAINERS updates
 - Quite a lot of lib/ updates
 - checkpatch updates
 - binfmt updates
 - autofs4
 - drivers/rtc/
 - various small tweaks to less used filesystems
 - ipc/ updates
 - kernel/watchdog.c changes

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (135 commits)
  mm: softdirty: enable write notifications on VMAs after VM_SOFTDIRTY cleared
  kernel/param: consolidate __{start,stop}___param[] in <linux/moduleparam.h>
  ia64: remove duplicate declarations of __per_cpu_start[] and __per_cpu_end[]
  frv: remove unused declarations of __start___ex_table and __stop___ex_table
  kvm: ensure hard lockup detection is disabled by default
  kernel/watchdog.c: control hard lockup detection default
  staging: rtl8192u: use %*pEn to escape buffer
  staging: rtl8192e: use %*pEn to escape buffer
  staging: wlan-ng: use %*pEhp to print SN
  lib80211: remove unused print_ssid()
  wireless: hostap: proc: print properly escaped SSID
  wireless: ipw2x00: print SSID via %*pE
  wireless: libertas: print esaped string via %*pE
  lib/vsprintf: add %*pE[achnops] format specifier
  lib / string_helpers: introduce string_escape_mem()
  lib / string_helpers: refactoring the test suite
  lib / string_helpers: move documentation to c-file
  include/linux: remove strict_strto* definitions
  arch/x86/mm/numa.c: fix boot failure when all nodes are hotpluggable
  fs: check bh blocknr earlier when searching lru
  ...

2 files changed, 7 insertions, 7 deletions

diff --git a/arch/arm/boot/dts/exynos3250.dtsi b/arch/arm/boot/dts/exynos3250.dtsi
index 1d52de6370d5..429a6c6cfcf9 100644
--- a/arch/arm/boot/dts/exynos3250.dtsi
+++ b/arch/arm/boot/dts/exynos3250.dtsi
@@ -164,7 +164,7 @@
                 };
 
                 rtc: rtc@10070000 {
-                        compatible = "samsung,s3c6410-rtc";
+                        compatible = "samsung,exynos3250-rtc";
                         reg = <0x10070000 0x100>;
                         interrupts = <0 73 0>, <0 74 0>;
                         status = "disabled";
diff --git a/arch/arm/mach-pxa/lpd270.c b/arch/arm/mach-pxa/lpd270.c
index 9f6ec167902a..ad777b353bd5 100644
--- a/arch/arm/mach-pxa/lpd270.c
+++ b/arch/arm/mach-pxa/lpd270.c
@@ -416,17 +416,17 @@ static struct pxafb_mach_info *lpd270_lcd_to_use;
 
 static int __init lpd270_set_lcd(char *str)
 {
-        if (!strnicmp(str, "lq057q3dc02", 11)) {
+        if (!strncasecmp(str, "lq057q3dc02", 11)) {
                 lpd270_lcd_to_use = &sharp_lq057q3dc02;
-        } else if (!strnicmp(str, "lq121s1dg31", 11)) {
+        } else if (!strncasecmp(str, "lq121s1dg31", 11)) {
                 lpd270_lcd_to_use = &sharp_lq121s1dg31;
-        } else if (!strnicmp(str, "lq036q1da01", 11)) {
+        } else if (!strncasecmp(str, "lq036q1da01", 11)) {
                 lpd270_lcd_to_use = &sharp_lq036q1da01;
-        } else if (!strnicmp(str, "lq64d343", 8)) {
+        } else if (!strncasecmp(str, "lq64d343", 8)) {
                 lpd270_lcd_to_use = &sharp_lq64d343;
-        } else if (!strnicmp(str, "lq10d368", 8)) {
+        } else if (!strncasecmp(str, "lq10d368", 8)) {
                 lpd270_lcd_to_use = &sharp_lq10d368;
-        } else if (!strnicmp(str, "lq035q7db02-20", 14)) {
+        } else if (!strncasecmp(str, "lq035q7db02-20", 14)) {
                 lpd270_lcd_to_use = &sharp_lq035q7db02_20;
         } else {
                 printk(KERN_INFO "lpd270: unknown lcd panel [%s]\n", str);