Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluet...
authorDavid S. Miller <davem@davemloft.net>
Thu, 11 Jun 2009 12:47:43 +0000 (05:47 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 11 Jun 2009 12:47:43 +0000 (05:47 -0700)
1  2 
include/net/bluetooth/bluetooth.h

Simple merge