Graeme Gregory
521d8ec3f0
mfd: Add phoenix lite (twl6025) support to twl6030 ...
Phoenix Lite is based on the twl6030 family of PMICs. It has mostly the
same feature set of twl6030 but with small changes. The codec block has
also been removed. It also has a new charger block and new features in
its ADC block. VUSB handling also differs.
Signed-off-by: Graeme Gregory <gg@slimlogic.co.uk>
Reviewed-by: Mark Brown <broonie@opensource.wolfsonicro.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
2011-05-26 19:45:39 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2011-05-25 17:00:17 -07:00
Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
2011-05-24 12:06:40 -07:00
mfd: Add phoenix lite (twl6025) support to twl6030
2011-05-26 19:45:39 +02:00
[media] rc: add locking to fix register/show race
2011-05-20 16:21:22 -03:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/linux-2.6-nsfd
2011-05-25 18:10:16 -07:00
pcmcia: Make declaration and uses of struct pcmcia_device_id const
2011-05-06 07:46:15 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2011-05-20 13:43:21 -07:00
scsi: remove performance regression due to async queue run
2011-05-17 11:04:44 +02:00
Merge branch 'topic/asoc' into for-linus
2011-05-22 10:01:33 +02:00
Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2011-05-19 18:14:34 -07:00
Merge branches 'common/fbdev' and 'common/fbdev-meram' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
2011-05-24 15:49:57 +09:00
Merge branch 'for-2.6.40/drivers' of git://git.kernel.dk/linux-2.6-block
2011-05-25 09:15:35 -07:00
521d8ec3f0