projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ce0fda1
4311051
)
Merge branch 'for-32/i2c/irqflags' into for-linus/i2c-3.2
author
Ben Dooks
<ben-linux@fluff.org>
Tue, 1 Nov 2011 00:52:53 +0000
(
00:52
+0000)
committer
Ben Dooks
<ben-linux@fluff.org>
Tue, 1 Nov 2011 00:52:53 +0000
(
00:52
+0000)
Conflicts:
drivers/i2c/busses/i2c-designware-core.c
Fixed up merge conflic
Trivial merge