commit | 7ada1dd62804ca9ce1cb8666c6e563cd92fa50c1 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Feb 14 15:26:42 2012 -0800 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Feb 14 15:26:42 2012 -0800 |
tree | 210489b69f5db64fb0450a310ce9f8762121a66f | |
parent | ebf4bcbd5f249afc8f48a7aa32255f8ebbff5876 [diff] | |
parent | 9fc886a1880766fb91cb27c2e96bd814cef640d6 [diff] |
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)