Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluet...
authorDavid S. Miller <davem@davemloft.net>
Tue, 19 Aug 2008 08:33:25 +0000 (01:33 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 19 Aug 2008 08:33:25 +0000 (01:33 -0700)
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge