Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/llc-2.6
authorDavid S. Miller <davem@sunset.davemloft.net>
Mon, 26 Sep 2005 22:29:31 +0000 (15:29 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Mon, 26 Sep 2005 22:29:31 +0000 (15:29 -0700)

Trivial merge