Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/blueto...
authorDavid S. Miller <davem@davemloft.net>
Thu, 7 Oct 2010 07:59:39 +0000 (00:59 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 7 Oct 2010 07:59:39 +0000 (00:59 -0700)

Trivial merge