Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDavid S. Miller <davem@davemloft.net>
Sun, 27 Jul 2008 11:40:08 +0000 (04:40 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 27 Jul 2008 11:40:08 +0000 (04:40 -0700)

Trivial merge