Merge branch 'for-2.6.37' into for-2.6.38

Conflicts:
	include/linux/mfd/wm8994/pdata.h

diff --cc include/linux/mfd/wm8994/pdata.h
index 882b51aefbc07b76c1a507534802d4ffa8f6b271,add8a1b8bcf0057c3f328c51dc96a4d82ae331a5..9eab263658beb99b043b2cc2c2f441cc25e120d8
--- 1/include/linux/mfd/wm8994/pdata.h
--- 2/include/linux/mfd/wm8994/pdata.h
+++ b/include/linux/mfd/wm8994/pdata.h
@@@ -29,9 -29,7 +29,9 @@@ struct wm8994_ldo_pdata 
  #define WM8994_CONFIGURE_GPIO 0x8000
  
  #define WM8994_DRC_REGS 5
- #define WM8994_EQ_REGS  19
+ #define WM8994_EQ_REGS  20
 +#define WM8958_MBC_CUTOFF_REGS 20
 +#define WM8958_MBC_COEFF_REGS  48
  
  /**
   * DRC configurations are specified with a label and a set of register

diff --cc sound/soc/codecs/wm_hubs.c
Simple merge

diff --cc sound/soc/soc-core.c
Simple merge