Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/blueto...
authorDavid S. Miller <davem@davemloft.net>
Thu, 8 Mar 2012 06:53:48 +0000 (22:53 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 8 Mar 2012 06:53:48 +0000 (22:53 -0800)

Trivial merge