Merge branch 'net-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6
authorDavid S. Miller <davem@davemloft.net>
Sat, 9 May 2009 20:20:46 +0000 (13:20 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 9 May 2009 20:20:46 +0000 (13:20 -0700)

Trivial merge