Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDavid S. Miller <davem@sunset.davemloft.net>
Thu, 15 Dec 2005 00:21:48 +0000 (16:21 -0800)
committerDavid S. Miller <davem@sunset.davemloft.net>
Thu, 15 Dec 2005 00:21:48 +0000 (16:21 -0800)
commit28247644cc07b54a798d997631d01531f2d9acfd
treea4cffdcacd92504b23045cdea60f8c4aa45dd466
parent1542272a60ab9c0655a13ead8b7d7a661365f9fb
parentc7868048a7314bb4a2973097d605f00acd3b70bd
Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6