Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/rusty/linux...
authorDavid S. Miller <davem@davemloft.net>
Tue, 2 Dec 2008 23:05:06 +0000 (15:05 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 2 Dec 2008 23:05:06 +0000 (15:05 -0800)

Trivial merge