git://developer.intra2net.com
/
libi2ncommon
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a3296c1
3395ec0
)
Merge branch 'kernel-update'
author
Thomas Jarosch
<thomas.jarosch@intra2net.com>
Fri, 21 Jan 2011 16:04:33 +0000 (17:04 +0100)
committer
Thomas Jarosch
<thomas.jarosch@intra2net.com>
Fri, 21 Jan 2011 16:04:33 +0000 (17:04 +0100)
Conflicts:
miscscripts/miscscripts.spec
packages/buildsys-build-rpmfusion/buildsys-build-rpmfusion-kerneldevpkgs-current
Trivial merge