git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0201518
a5e8546
)
Merge branch 'lvs-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/horms...
author
David S. Miller
<davem@davemloft.net>
Wed, 8 Oct 2008 21:26:36 +0000
(14:26 -0700)
committer
David S. Miller
<davem@davemloft.net>
Wed, 8 Oct 2008 21:26:36 +0000
(14:26 -0700)
Conflicts:
net/netfilter/Kconfig
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff