Merge branch 'topic/hotplug' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 27 Nov 2012 20:06:08 +0000 (20:06 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 27 Nov 2012 20:06:08 +0000 (20:06 +0000)
commitb87d07b13c779c42e4929e590003c9eb8c2f06fa
tree9fbe55b61e176e783e5c6d6063733079d0274948
parent77b71b370ed06c75bdebef09be438d5275f70fc1
parent8dc995f56ef7aedb41873fdeaa1971f3aa166ebd
Merge branch 'topic/hotplug' of git://git./linux/kernel/git/broonie/regulator into regulator-max8997

Conflicts:
drivers/regulator/max8997.c
drivers/regulator/max8997.c