From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 1 Nov 2011 00:46:07 +0000 (-0700)
Subject: Merge branch 'akpm' (Andrew's incoming)
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=094803e0aab3fe75bbf8202a8f4b5280eaade375;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

Merge branch 'akpm' (Andrew's incoming)

Quoth Andrew:

 - Most of MM.  Still waiting for the poweroc guys to get off their
   butts and review some threaded hugepages patches.

 - alpha

 - vfs bits

 - drivers/misc

 - a few core kerenl tweaks

 - printk() features

 - MAINTAINERS updates

 - backlight merge

 - leds merge

 - various lib/ updates

 - checkpatch updates

* akpm: (127 commits)
  epoll: fix spurious lockdep warnings
  checkpatch: add a --strict check for utf-8 in commit logs
  kernel.h/checkpatch: mark strict_strto<foo> and simple_strto<foo> as obsolete
  llist-return-whether-list-is-empty-before-adding-in-llist_add-fix
  wireless: at76c50x: follow rename pack_hex_byte to hex_byte_pack
  fat: follow rename pack_hex_byte() to hex_byte_pack()
  security: follow rename pack_hex_byte() to hex_byte_pack()
  kgdb: follow rename pack_hex_byte() to hex_byte_pack()
  lib: rename pack_hex_byte() to hex_byte_pack()
  lib/string.c: fix strim() semantics for strings that have only blanks
  lib/idr.c: fix comment for ida_get_new_above()
  lib/percpu_counter.c: enclose hotplug only variables in hotplug ifdef
  lib/bitmap.c: quiet sparse noise about address space
  lib/spinlock_debug.c: print owner on spinlock lockup
  lib/kstrtox: common code between kstrto*() and simple_strto*() functions
  drivers/leds/leds-lp5521.c: check if reset is successful
  leds: turn the blink_timer off before starting to blink
  leds: save the delay values after a successful call to blink_set()
  drivers/leds/leds-gpio.c: use gpio_get_value_cansleep() when initializing
  drivers/leds/leds-lm3530.c: add __devexit_p where needed
  ...
---

094803e0aab3fe75bbf8202a8f4b5280eaade375
diff --cc drivers/platform/x86/hp_accel.c
index 64b454855f6,f93a47b7136..22b2dfa7314
--- a/drivers/platform/x86/hp_accel.c
+++ b/drivers/platform/x86/hp_accel.c
@@@ -228,11 -229,8 +230,12 @@@ static struct dmi_system_id lis3lv02d_d
  	AXIS_DMI_MATCH("HPB452x", "HP ProBook 452", y_inverted),
  	AXIS_DMI_MATCH("HPB522x", "HP ProBook 522", xy_swap),
  	AXIS_DMI_MATCH("HPB532x", "HP ProBook 532", y_inverted),
+ 	AXIS_DMI_MATCH("HPB655x", "HP ProBook 655", xy_swap_inverted),
  	AXIS_DMI_MATCH("Mini510x", "HP Mini 510", xy_rotated_left_usd),
 +	AXIS_DMI_MATCH("HPB63xx", "HP ProBook 63", xy_swap),
 +	AXIS_DMI_MATCH("HPB64xx", "HP ProBook 64", xy_swap),
 +	AXIS_DMI_MATCH("HPB64xx", "HP EliteBook 84", xy_swap),
 +	AXIS_DMI_MATCH("HPB65xx", "HP ProBook 65", x_inverted),
  	{ NULL, }
  /* Laptop models without axis info (yet):
   * "NC6910" "HP Compaq 6910"
diff --cc include/linux/kexec.h
index fe45136b32c,8944ebe7963..2fa0901219d
--- a/include/linux/kexec.h
+++ b/include/linux/kexec.h
@@@ -137,11 -129,9 +137,11 @@@ extern void crash_kexec(struct pt_regs 
  int kexec_should_crash(struct task_struct *);
  void crash_save_cpu(struct pt_regs *regs, int cpu);
  void crash_save_vmcoreinfo(void);
 +void crash_map_reserved_pages(void);
 +void crash_unmap_reserved_pages(void);
  void arch_crash_save_vmcoreinfo(void);
- void vmcoreinfo_append_str(const char *fmt, ...)
- 	__attribute__ ((format (printf, 1, 2)));
+ __printf(1, 2)
+ void vmcoreinfo_append_str(const char *fmt, ...);
  unsigned long paddr_vmcoreinfo_note(void);
  
  #define VMCOREINFO_OSRELEASE(value) \