summaryrefslogtreecommitdiffstats
path: root/drivers/bluetooth
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-12-21 03:39:37 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2011-12-21 03:39:37 +0100
commitb9e26dfdad5a4f9cbdaacafac6998614cc9c41bc (patch)
tree320442f423d38ae2eeafe0764985c72af9adaed2 /drivers/bluetooth
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb... (diff)
parentmtd: plat_ram: call mtd_device_register only if partition data exists (diff)
downloadlinux-b9e26dfdad5a4f9cbdaacafac6998614cc9c41bc.tar.xz
linux-b9e26dfdad5a4f9cbdaacafac6998614cc9c41bc.zip
Merge git://git.infradead.org/mtd-2.6
* git://git.infradead.org/mtd-2.6: mtd: plat_ram: call mtd_device_register only if partition data exists mtd: pxa2xx-flash.c: It used to fall back to provided table. mtd: gpmi: add missing include 'module.h' mtd: ndfc: fix typo in structure dereference
Diffstat (limited to 'drivers/bluetooth')
0 files changed, 0 insertions, 0 deletions