]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b4ad86b 2bbf29a)
Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6
authorDavid S. Miller <davem@sunset.davemloft.net>
Mon, 4 Dec 2006 03:24:40 +0000 (19:24 -0800)
committerDavid S. Miller <davem@sunset.davemloft.net>
Mon, 4 Dec 2006 03:24:40 +0000 (19:24 -0800)

Trivial merge
Linux 2.6 source tree