From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 5 Oct 2012 18:09:16 +0000 (+0900)
Subject: Merge branch 'akpm' (Andrew's patch-bomb)
X-Git-Tag: MMI-PSA29.97-13-9~15835
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=11126c611e10abb18b6f1ed0300c0548c3906b54;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'akpm' (Andrew's patch-bomb)

Merge misc patches from Andrew Morton:
 "The MM tree is rather stuck while I wait to find out what the heck is
  happening with sched/numa.  Probably I'll need to route around all the
  code which was added to -next, sigh.

  So this is "everything else", or at least most of it - other small
  bits are still awaiting resolutions of various kinds."

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (180 commits)
  lib/decompress.c add __init to decompress_method and data
  kernel/resource.c: fix stack overflow in __reserve_region_with_split()
  omfs: convert to use beXX_add_cpu()
  taskstats: cgroupstats_user_cmd() may leak on error
  aoe: update aoe-internal version number to 50
  aoe: update documentation to better reflect aoe-plus-udev usage
  aoe: remove unused code
  aoe: make dynamic block minor numbers the default
  aoe: update and specify AoE address guards and error messages
  aoe: retain static block device numbers for backwards compatibility
  aoe: support more AoE addresses with dynamic block device minor numbers
  aoe: update documentation with new URL and VM settings reference
  aoe: update copyright year in touched files
  aoe: update internal version number to 49
  aoe: remove unused code and add cosmetic improvements
  aoe: increase net_device reference count while using it
  aoe: associate frames with the AoE storage target
  aoe: disallow unsupported AoE minor addresses
  aoe: do revalidation steps in order
  aoe: failover remote interface based on aoe_deadsecs parameter
  ...
---

11126c611e10abb18b6f1ed0300c0548c3906b54
diff --cc drivers/mfd/wm8994-core.c
index 3d6d9beb18d4,dd8dfbee39ec..8fefc961ec06
--- a/drivers/mfd/wm8994-core.c
+++ b/drivers/mfd/wm8994-core.c
@@@ -388,9 -388,9 +388,9 @@@ static const __devinitconst struct reg_
  	{ 0x102, 0x0 },
  };
  
- static const __devinitdata struct reg_default wm1811_reva_patch[] = {
+ static const __devinitconst struct reg_default wm1811_reva_patch[] = {
  	{ 0x102, 0x3 },
 -	{ 0x56, 0x7 },
 +	{ 0x56, 0xc07 },
  	{ 0x5d, 0x7e },
  	{ 0x5e, 0x0 },
  	{ 0x102, 0x0 },