Merge branch 'for-david' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6
authorDavid S. Miller <davem@davemloft.net>
Sat, 22 Nov 2008 05:30:58 +0000 (21:30 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sat, 22 Nov 2008 05:30:58 +0000 (21:30 -0800)

Trivial merge