Merge tag 'v3.18-rc4' into regulator-max77802
authorMark Brown <broonie@kernel.org>
Wed, 26 Nov 2014 20:37:57 +0000 (20:37 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 26 Nov 2014 20:37:57 +0000 (20:37 +0000)
Linux 3.18-rc4

1  2 
drivers/regulator/max77802.c
drivers/regulator/of_regulator.c

Simple merge
Simple merge