Merge branch 'linux-2.6.30.y' of git://git.kernel.org/pub/scm/linux/kernel/git/inaky...
authorDavid S. Miller <davem@davemloft.net>
Wed, 6 May 2009 23:42:19 +0000 (16:42 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 6 May 2009 23:42:19 +0000 (16:42 -0700)

Trivial merge