summaryrefslogtreecommitdiff
path: root/drivers/base
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-11-08 14:16:06 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-11-08 14:16:06 +0000
commit81bf58eb3c16302f19676e73dfe4d1832199c0ef (patch)
tree529d42f058dbe903ae2400bdcf4c8e207654662f /drivers/base
parentb973aa3624a531c7d2b4d8d199142299488f573e (diff)
parentf8beab2bb611d735767871e0e1a12dc6a0def7b1 (diff)
parent50b776fc71c13663eb7434f634f2b796de5c9885 (diff)
Merge branches 'regmap/irq' and 'regmap/cache' into regmap-next