diff options
| author |   Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-22 19:26:07 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-22 19:26:07 +0100 |
| commit | 38e23194e1c95e73819d25a63bcf94fe4709d4c5 (patch) | |
| tree | 42a7d1e2f3778adcd13a4376ae9e0810ef6d387b /include/linux/regmap.h | |
| parent | regmap: Fix incorrect arguments to kzalloc() call (diff) | |
| parent | regmap: Implement support for wake IRQs (diff) | |
| parent | regmap: Fix work_buf switching for page update during virtual range access. (diff) | |
| download | linux-dev-38e23194e1c95e73819d25a63bcf94fe4709d4c5.tar.xz linux-dev-38e23194e1c95e73819d25a63bcf94fe4709d4c5.zip | |
Merge branches 'regmap-core', 'regmap-irq' and 'regmap-page' into regmap-next
Conflicts (trivial context stuff):
drivers/base/regmap/regmap.c
include/linux/regmap.h