]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'regmap/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Dec 2011 04:30:23 +0000 (15:30 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Dec 2011 04:30:23 +0000 (15:30 +1100)
commitac09b309f94d082f356f6161835f151258313d0c
treedd8fcd22c308631ca554e9ae144f33cbe31ec953
parent0c91bf60cc40f66b08b99213b4692d092a2521ed
parent681ba97d9fbff59f67c71f1d9a88ad0b8ef49d25
Merge remote-tracking branch 'regmap/for-next'

Conflicts:
drivers/base/regmap/regcache.c
drivers/base/regmap/regmap.c