]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Feb 2012 23:26:42 +0000 (15:26 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Feb 2012 23:26:42 +0000 (15:26 -0800)
commit7ada1dd62804ca9ce1cb8666c6e563cd92fa50c1
tree210489b69f5db64fb0450a310ce9f8762121a66f
parentebf4bcbd5f249afc8f48a7aa32255f8ebbff5876
parent9fc886a1880766fb91cb27c2e96bd814cef640d6
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

One small bug fix from Axel plus a fix for a build failure in unrealistic
but commonly built configs which for some reason manage to survive for
an awfully long time in -next without any reports.

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: Fix getting voltage in max8649_enable_time()
  regulator: Fix mc13xxx regulator modular build (again)