git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
475ad8e
d6e8cc6
)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
author
David S. Miller
<davem@davemloft.net>
Fri, 28 Nov 2008 10:19:15 +0000
(
02:19
-0800)
committer
David S. Miller
<davem@davemloft.net>
Fri, 28 Nov 2008 10:19:15 +0000
(
02:19
-0800)
Conflicts:
net/netfilter/nf_conntrack_netlink.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff