Mark Brown
688fe99a43
regulator: Add option for machine drivers to enable the dummy regulator ...
Allow machine drivers to explicitly enable the use of the dummy regulator,
enabling simpler support for systems with only a few specific supplies
visible to software.
It is strongly recommended that this is not used on systems with
substantial software control over their PMICs, for maximum functionality
constrints should be as fully specified as possible.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
2010-10-28 22:40:31 +01:00
Merge branch 'misc' into release
2010-10-26 14:51:00 -04:00
taskstats: use real microsecond granularity for CPU times
2010-10-27 18:03:17 -07:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-10-24 13:41:39 -07:00
Merge remote branch 'intel/drm-intel-next' of ../drm-next into drm-core-next
2010-10-26 09:23:22 +10:00
regulator: Add option for machine drivers to enable the dummy regulator
2010-10-28 22:40:31 +01:00
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
2010-10-28 09:35:11 -07:00
9p: Add datasync to client side TFSYNC/RFSYNC for dotl
2010-10-28 09:08:49 -05:00
IB/core: Add VLAN support for IBoE
2010-10-25 10:20:39 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
2010-10-26 17:54:22 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
2010-10-25 08:32:05 -07:00
Merge branch 'next' into upstream-merge
2010-10-27 23:44:47 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
2010-10-25 08:32:05 -07:00
Merge branches 'upstream/xenfs' and 'upstream/core' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen
2010-10-26 18:20:19 -07:00
688fe99a43