]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Merge remote-tracking branch 'regmap/fix/core' into tmp
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 31 Mar 2013 22:09:22 +0000 (23:09 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 31 Mar 2013 22:09:22 +0000 (23:09 +0100)
1  2 
drivers/base/regmap/regmap.c

Simple merge