Skip to content
GitLab
Explore
Sign in
Commit
38e23194
authored
Jul 22, 2012
by
Mark Brown
Browse files
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
parents
46335119
a43fd50d
632a5b01
Changes
514
Hide whitespace changes
Inline
Side-by-side
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment