diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-22 18:26:07 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-22 18:26:07 (GMT) |
| commit | 38e23194e1c95e73819d25a63bcf94fe4709d4c5 (patch) | |
| tree | 42a7d1e2f3778adcd13a4376ae9e0810ef6d387b /arch/x86/xen/smp.c | |
| parent | 463351194d826af7ae97fff0ed6f0fe2a4fed615 (diff) | |
| parent | a43fd50dc99a5f65505f174eca5a421707d73b4c (diff) | |
| parent | 632a5b01db8cd4068a06f8a67720ea4f9b00d9b3 (diff) | |
| download | linux-fsl-qoriq-38e23194e1c95e73819d25a63bcf94fe4709d4c5.tar.xz | |
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