OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
563b449
f3851b0
)
Merge branch 'sfc-3.11'
author
Ben Hutchings
<bhutchings@solarflare.com>
Wed, 21 Aug 2013 13:19:36 +0000
(14:19 +0100)
committer
Ben Hutchings
<bhutchings@solarflare.com>
Wed, 21 Aug 2013 13:19:36 +0000
(14:19 +0100)
Merge sfc fixes destined for 3.11 so we can avoid conflicts with
development for 3.12+.
Trivial merge