summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2012-01-02 16:43:54 -0500
committerJohn W. Linville <linville@tuxdriver.com>2012-01-02 16:43:54 -0500
commitdc0d633e35643662f27a0b1c531da3cd6b204b9c (patch)
treecae724ecca3fb997bf3ad6b70bff4e3c739cd648 /init
parentaef6c928a92481f75fbd548eb8c1e840912444b8 (diff)
parent4ae1652ef1bf38e07caa5d1d86ffd3b31103b55a (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions