summaryrefslogtreecommitdiff
path: root/fs/btrfs/volumes.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-12-31 20:22:45 +0300
committerDavid S. Miller <davem@davemloft.net>2015-12-31 20:22:45 +0300
commit7b22a7788b0263f42f7232c5c05c503424ffa0ba (patch)
treee6460f2340320ad4194764183ca601e8371096cc /fs/btrfs/volumes.c
parentccac0425655918fccd0ffec47b2788cb1ac62d7b (diff)
parent7ddb69222d0fdc0bc83b60dbb21d9864ebf2907e (diff)
downloadlinux-7b22a7788b0263f42f7232c5c05c503424ffa0ba.tar.xz
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Johan Hedberg says: ==================== pull request: bluetooth-next 2015-12-31 Here's (probably) the last bluetooth-next pull request for the 4.5 kernel: - Add support for BCM2E65 ACPI ID - Minor fixes/cleanups in the bcm203x & bfusb drivers - Minor debugfs related fix in 6lowpan code Please let me know if there are any issues pulling. Thanks. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs/btrfs/volumes.c')
0 files changed, 0 insertions, 0 deletions