projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2f6ae6e
6b16351
)
Merge tag 'v3.5-rc4' into regulator-drivers
author
Mark Brown
<broonie@opensource.wolfsonmicro.com>
Mon, 25 Jun 2012 09:11:40 +0000
(10:11 +0100)
committer
Mark Brown
<broonie@opensource.wolfsonmicro.com>
Mon, 25 Jun 2012 09:11:40 +0000
(10:11 +0100)
Linux 3.5-rc4 contains patches which conflict with some of the
development work.
1
2
drivers/regulator/anatop-regulator.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/regulator/core.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/regulator/palmas-regulator.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/regulator/s5m8767.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/regulator/anatop-regulator.c
Simple merge
diff --cc
drivers/regulator/core.c
Simple merge
diff --cc
drivers/regulator/palmas-regulator.c
Simple merge
diff --cc
drivers/regulator/s5m8767.c
Simple merge