]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7a64761 6560ffd)
Merge tag 'regmap-3.4' into regmap-stride
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 12 May 2012 12:06:08 +0000 (13:06 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 12 May 2012 12:06:08 +0000 (13:06 +0100)
commit25061d285747f20aafa4b50df1b0b5665fef29cd
treec302ac93e3476788a4671ee556a902fce2592f3atree | snapshot
parent7a6476143270d947924f5bbbc124accb0e558bf4commit | diff
parent6560ffd1ccd688152393dc7c35dbdcc33140633bcommit | diff
Merge tag 'regmap-3.4' into regmap-stride

regmap: Last minute bug fix for 3.4

This is a last minute bug fix that was only just noticed since the code
path that's being exercised here is one that is fairly rarely used.  The
changelog for the change itself is extremely clear and the code itself
is obvious to inspection so should be pretty safe.

Conflicts:
drivers/base/regmap/regmap.c (overlap between the fix and stride code)
drivers/base/regmap/regmap.c diff1 | diff2 | blob | history
Linux kernel for KaRo TX COM modules