Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-commands.h

Conflicts:
	Documentation/DocBook/drm.tmpl
	Documentation/feature-removal-schedule.txt
	Documentation/filesystems/xfs-delayed-logging-design.txt
	Documentation/kvm/api.txt
	Documentation/kvm/mmu.txt
	Documentation/sysctl/vm.txt
	Documentation/watchdog/watchdog-parameters.txt
	MAINTAINERS
	Makefile
	arch/alpha/kernel/pci-sysfs.c
	arch/arm/configs/am3517_evm_defconfig
	arch/arm/configs/ams_delta_defconfig
	arch/arm/configs/devkit8000_defconfig
	arch/arm/configs/mx51_defconfig
	arch/arm/configs/omap3_defconfig
	arch/arm/configs/omap3_evm_defconfig
	arch/arm/configs/omap3_stalker_lks_defconfig
	arch/arm/configs/omap_4430sdp_defconfig
	arch/arm/configs/rx51_defconfig
	arch/arm/configs/s3c2410_defconfig
	arch/arm/configs/s3c6400_defconfig
	arch/arm/configs/s5p6440_defconfig
	arch/arm/configs/s5p6442_defconfig
	arch/arm/configs/s5pc100_defconfig
	arch/arm/configs/s5pc110_defconfig
	arch/arm/configs/s5pv210_defconfig
	arch/arm/mach-davinci/board-da850-evm.c
	arch/arm/mach-mx3/mach-mx31lilly.c
	arch/arm/mach-omap2/Makefile
	arch/arm/mach-omap2/board-4430sdp.c
	arch/arm/mach-omap2/board-omap3pandora.c
	arch/arm/mach-omap2/board-omap3stalker.c
	arch/arm/mach-omap2/board-rx51-peripherals.c
	arch/arm/mach-omap2/board-rx51-video.c
	arch/arm/mach-omap2/include/mach/omap4-common.h
	arch/arm/mach-omap2/omap_hwmod.c
	arch/arm/mach-omap2/pm34xx.c
	arch/arm/mach-s5pv210/setup-i2c0.c
	arch/arm/mach-s5pv210/setup-i2c1.c
	arch/arm/mach-s5pv210/setup-i2c2.c
	arch/arm/plat-omap/gpio.c
	arch/arm/plat-omap/include/plat/uncompress.h
	arch/arm/plat-s5p/irq-eint.c
	arch/arm/plat-samsung/dev-i2c2.c
	arch/arm/plat-samsung/include/plat/iic.h
	arch/arm/plat-samsung/include/plat/sdhci.h
	arch/mips/kernel/mips-mt-fpaff.c
	arch/mips/oprofile/op_model_loongson2.c
	arch/powerpc/kernel/crash.c
	arch/powerpc/kernel/irq.c
	arch/powerpc/kernel/machine_kexec_64.c
	arch/powerpc/kernel/ppc_ksyms.c
	arch/powerpc/kernel/setup_64.c
	arch/powerpc/platforms/44x/Kconfig
	arch/powerpc/sysdev/fsl_msi.c
	arch/powerpc/sysdev/fsl_rio.c
	arch/sh/boards/mach-ecovec24/setup.c
	arch/sh/boards/mach-se/7724/setup.c
	arch/sparc/include/asm/fb.h
	arch/x86/kernel/cpu/perf_event_p4.c
	arch/x86/kernel/kgdb.c
	arch/x86/kernel/setup_percpu.c
	arch/x86/kvm/emulate.c
	arch/x86/kvm/i8259.c
	arch/x86/kvm/mmu.c
	arch/x86/kvm/mmutrace.h
	arch/x86/kvm/paging_tmpl.h
	arch/x86/kvm/svm.c
	arch/x86/kvm/vmx.c
	arch/x86/kvm/x86.c
	arch/x86/mm/pat_rbtree.c
	block/blk-core.c
	block/cfq-iosched.c
	crypto/ablkcipher.c
	drivers/acpi/acpi_pad.c
	drivers/acpi/acpica/evxfevnt.c
	drivers/acpi/apei/apei-base.c
	drivers/acpi/apei/erst.c
	drivers/acpi/atomicio.c
	drivers/acpi/processor_idle.c
	drivers/acpi/sleep.c
	drivers/ata/Kconfig
	drivers/ata/ata_generic.c
	drivers/base/core.c
	drivers/block/drbd/drbd_int.h
	drivers/block/drbd/drbd_main.c
	drivers/block/drbd/drbd_receiver.c
	drivers/char/Kconfig
	drivers/char/agp/intel-agp.c
	drivers/char/agp/intel-agp.h
	drivers/char/agp/intel-gtt.c
	drivers/char/ipmi/ipmi_si_intf.c
	drivers/char/n_gsm.c
	drivers/char/virtio_console.c
	drivers/crypto/Kconfig
	drivers/crypto/Makefile
	drivers/crypto/n2_core.c
	drivers/crypto/talitos.c
	drivers/dma/ioat/dma.h
	drivers/dma/ioat/dma_v2.c
	drivers/firewire/core-transaction.c
	drivers/firewire/core.h
	drivers/firewire/ohci.c
	drivers/gpu/drm/Kconfig
	drivers/gpu/drm/drm_crtc_helper.c
	drivers/gpu/drm/drm_fb_helper.c
	drivers/gpu/drm/i915/i915_debugfs.c
	drivers/gpu/drm/i915/i915_dma.c
	drivers/gpu/drm/i915/i915_drv.h
	drivers/gpu/drm/i915/i915_gem.c
	drivers/gpu/drm/i915/i915_irq.c
	drivers/gpu/drm/i915/i915_reg.h
	drivers/gpu/drm/i915/i915_suspend.c
	drivers/gpu/drm/i915/i915_trace.h
	drivers/gpu/drm/i915/intel_display.c
	drivers/gpu/drm/i915/intel_dp.c
	drivers/gpu/drm/i915/intel_drv.h
	drivers/gpu/drm/i915/intel_fb.c
	drivers/gpu/drm/i915/intel_lvds.c
	drivers/gpu/drm/i915/intel_sdvo.c
	drivers/gpu/drm/nouveau/Makefile
	drivers/gpu/drm/nouveau/nouveau_bios.c
	drivers/gpu/drm/nouveau/nouveau_bo.c
	drivers/gpu/drm/nouveau/nouveau_connector.c
	drivers/gpu/drm/nouveau/nouveau_display.c
	drivers/gpu/drm/nouveau/nouveau_drv.c
	drivers/gpu/drm/nouveau/nouveau_drv.h
	drivers/gpu/drm/nouveau/nouveau_fbcon.c
	drivers/gpu/drm/nouveau/nouveau_grctx.c
	drivers/gpu/drm/nouveau/nouveau_state.c
	drivers/gpu/drm/nouveau/nv40_graph.c
	drivers/gpu/drm/nouveau/nv50_crtc.c
	drivers/gpu/drm/nouveau/nv50_display.c
	drivers/gpu/drm/nouveau/nv50_sor.c
	drivers/gpu/drm/radeon/atombios_crtc.c
	drivers/gpu/drm/radeon/evergreen.c
	drivers/gpu/drm/radeon/evergreend.h
	drivers/gpu/drm/radeon/r100.c
	drivers/gpu/drm/radeon/r420.c
	drivers/gpu/drm/radeon/r600.c
	drivers/gpu/drm/radeon/r600_audio.c
	drivers/gpu/drm/radeon/radeon.h
	drivers/gpu/drm/radeon/radeon_asic.c
	drivers/gpu/drm/radeon/radeon_asic.h
	drivers/gpu/drm/radeon/radeon_atombios.c
	drivers/gpu/drm/radeon/radeon_combios.c
	drivers/gpu/drm/radeon/radeon_connectors.c
	drivers/gpu/drm/radeon/radeon_device.c
	drivers/gpu/drm/radeon/radeon_display.c
	drivers/gpu/drm/radeon/radeon_drv.c
	drivers/gpu/drm/radeon/radeon_fb.c
	drivers/gpu/drm/radeon/radeon_kms.c
	drivers/gpu/drm/radeon/radeon_mode.h
	drivers/gpu/drm/radeon/radeon_object.c
	drivers/gpu/drm/radeon/radeon_pm.c
	drivers/gpu/drm/radeon/rs600.c
	drivers/gpu/drm/radeon/rs690.c
	drivers/gpu/drm/radeon/rv515.c
	drivers/gpu/drm/radeon/rv770.c
	drivers/gpu/drm/ttm/ttm_page_alloc.c
	drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
	drivers/hid/Kconfig
	drivers/hid/hid-core.c
	drivers/hid/usbhid/hid-core.c
	drivers/hid/usbhid/hid-quirks.c
	drivers/hwmon/ads7871.c
	drivers/hwmon/emc1403.c
	drivers/hwmon/tmp102.c
	drivers/i2c/busses/i2c-i801.c
	drivers/i2c/busses/i2c-mpc.c
	drivers/infiniband/hw/cxgb4/cq.c
	drivers/infiniband/hw/qib/Makefile
	drivers/infiniband/hw/qib/qib.h
	drivers/infiniband/hw/qib/qib_7220.h
	drivers/infiniband/hw/qib/qib_7322_regs.h
	drivers/infiniband/hw/qib/qib_diag.c
	drivers/infiniband/hw/qib/qib_fs.c
	drivers/infiniband/hw/qib/qib_iba6120.c
	drivers/infiniband/hw/qib/qib_iba7322.c
	drivers/infiniband/hw/qib/qib_init.c
	drivers/infiniband/hw/qib/qib_pcie.c
	drivers/infiniband/hw/qib/qib_sd7220.c
	drivers/infiniband/hw/qib/qib_sd7220_img.c
	drivers/infiniband/hw/qib/qib_tx.c
	drivers/input/misc/hp_sdc_rtc.c
	drivers/input/touchscreen/Kconfig
	drivers/input/touchscreen/Makefile
	drivers/input/touchscreen/ads7846.c
	drivers/input/touchscreen/tps6507x-ts.c
	drivers/isdn/capi/capi.c
	drivers/isdn/gigaset/capi.c
	drivers/isdn/gigaset/gigaset.h
	drivers/isdn/i4l/isdn_common.c
	drivers/isdn/mISDN/timerdev.c
	drivers/leds/led-class.c
	drivers/macintosh/macio_asic.c
	drivers/md/md.c
	drivers/md/raid0.c
	drivers/md/raid10.c
	drivers/md/raid5.c
	drivers/mfd/88pm860x-i2c.c
	drivers/mfd/Makefile
	drivers/mfd/ab3550-core.c
	drivers/mfd/max8925-i2c.c
	drivers/mfd/menelaus.c
	drivers/mfd/tc35892.c
	drivers/mfd/tps65010.c
	drivers/misc/Kconfig
	drivers/mmc/host/sh_mmcif.c
	drivers/mtd/chips/cfi_cmdset_0001.c
	drivers/mtd/chips/cfi_probe.c
	drivers/mtd/lpddr/lpddr_cmds.c
	drivers/mtd/maps/pismo.c
	drivers/mtd/mtd_blkdevs.c
	drivers/mtd/nand/Kconfig
	drivers/mtd/nand/Makefile
	drivers/mtd/nand/denali.h
	drivers/mtd/nand/mpc5121_nfc.c
	drivers/mtd/nand/mxc_nand.c
	drivers/mtd/nand/nand_base.c
	drivers/mtd/nand/nand_bbt.c
	drivers/mtd/nand/r852.c
	drivers/mtd/nand/sm_common.c
	drivers/mtd/onenand/Kconfig
	drivers/mtd/onenand/Makefile
	drivers/mtd/onenand/onenand_base.c
	drivers/net/bonding/bond_main.c
	drivers/net/cnic_if.h
	drivers/net/e1000e/hw.h
	drivers/net/ethoc.c
	drivers/net/fec.c
	drivers/net/ixgbe/ixgbe_ethtool.c
	drivers/net/ixgbe/ixgbe_phy.c
	drivers/net/ll_temac_main.c
	drivers/net/vxge/vxge-main.c
	drivers/net/wireless/libertas/host.h
	drivers/pci/intel-iommu.c
	drivers/pcmcia/m8xx_pcmcia.c
	drivers/platform/x86/intel_scu_ipc.c
	drivers/power/Kconfig
	drivers/power/ds2782_battery.c
	drivers/power/power_supply_core.c
	drivers/power/z2_battery.c
	drivers/regulator/tps6507x-regulator.c
	drivers/rtc/rtc-s3c.c
	drivers/s390/scsi/zfcp_erp.c
	drivers/s390/scsi/zfcp_fsf.c
	drivers/s390/scsi/zfcp_qdio.c
	drivers/serial/Kconfig
	drivers/serial/altera_uart.c
	drivers/sfi/sfi_core.c
	drivers/spi/mpc512x_psc_spi.c
	drivers/staging/Kconfig
	drivers/staging/Makefile
	drivers/staging/adis16255/Kconfig
	drivers/staging/adis16255/adis16255.c
	drivers/staging/batman-adv/bat_sysfs.c
	drivers/staging/batman-adv/hard-interface.c
	drivers/staging/batman-adv/main.c
	drivers/staging/batman-adv/originator.c
	drivers/staging/batman-adv/send.c
	drivers/staging/comedi/Kconfig
	drivers/staging/comedi/comedi_fops.c
	drivers/staging/comedi/drivers/Makefile
	drivers/staging/comedi/drivers/addi-data/addi_common.c
	drivers/staging/hv/Kconfig
	drivers/staging/hv/channel_mgmt.c
	drivers/staging/hv/hv_utils.c
	drivers/staging/hv/storvsc_drv.c
	drivers/staging/hv/vmbus_drv.c
	drivers/staging/iio/Documentation/iio_utils.h
	drivers/staging/iio/ring_sw.c
	drivers/staging/rtl8187se/r8180_core.c
	drivers/staging/wlags49_h2/Kconfig
	drivers/staging/wlags49_h25/Kconfig
	drivers/video/backlight/Kconfig
	drivers/video/backlight/Makefile
	drivers/video/backlight/adp8860_bl.c
	drivers/virtio/virtio_ring.c
	drivers/watchdog/imx2_wdt.c
	fs/block_dev.c
	fs/btrfs/extent-tree.c
	fs/btrfs/inode.c
	fs/btrfs/ioctl.c
	fs/btrfs/relocation.c
	fs/ceph/ceph_fs.h
	fs/ceph/file.c
	fs/ceph/inode.c
	fs/ceph/mds_client.c
	fs/ceph/messenger.c
	fs/ceph/mon_client.c
	fs/ceph/osd_client.c
	fs/ceph/osdmap.c
	fs/ceph/super.c
	fs/compat.c
	fs/configfs/inode.c
	fs/direct-io.c
	fs/ext2/inode.c
	fs/ext4/dir.c
	fs/ext4/ext4.h
	fs/ext4/extents.c
	fs/ext4/ialloc.c
	fs/ext4/inode.c
	fs/ext4/mballoc.c
	fs/ext4/super.c
	fs/fat/dir.c
	fs/fs-writeback.c
	fs/gfs2/bmap.c
	fs/gfs2/log.c
	fs/gfs2/quota.c
	fs/minix/namei.c
	fs/nilfs2/super.c
	fs/ocfs2/file.c
	fs/ocfs2/localalloc.c
	fs/ocfs2/quota_global.c
	fs/ocfs2/reservations.c
	fs/ocfs2/suballoc.c
	fs/ocfs2/xattr.c
	fs/partitions/check.c
	fs/partitions/check.h
	fs/partitions/ibm.c
	fs/pipe.c
	fs/quota/dquot.c
	fs/super.c
	fs/sync.c
	fs/sysfs/inode.c
	fs/sysfs/symlink.c
	fs/sysv/ialloc.c
	fs/xfs/linux-2.6/xfs_trace.c
	fs/xfs/xfs_log_recover.c
	fs/xfs/xfs_trans.c
	include/acpi/processor.h
	include/drm/drm_crtc_helper.h
	include/drm/radeon_drm.h
	include/drm/ttm/ttm_page_alloc.h
	include/linux/acpi.h
	include/linux/backing-dev.h
	include/linux/blkdev.h
	include/linux/compaction.h
	include/linux/compat.h
	include/linux/drbd.h
	include/linux/fb.h
	include/linux/fs.h
	include/linux/kvm.h
	include/linux/miscdevice.h
	include/linux/mmc/sh_mmcif.h
	include/linux/pipe_fs_i.h
	include/linux/syscalls.h
	include/linux/writeback.h
	include/net/netfilter/nf_conntrack.h
	include/trace/ftrace.h
	kernel/cpu.c
	kernel/debug/debug_core.c
	kernel/debug/gdbstub.c
	kernel/debug/kdb/kdb_main.c
	kernel/fork.c
	kernel/perf_event.c
	kernel/sysctl.c
	kernel/trace/trace_event_perf.c
	kernel/trace/trace_kprobe.c
	kernel/trace/trace_syscalls.c
	lib/kobject_uevent.c
	mm/compaction.c
	mm/memcontrol.c
	mm/mempolicy.c
	mm/page-writeback.c
	mm/shmem.c
	mm/swapfile.c
	mm/vmscan.c
	net/bluetooth/hci_event.c
	net/bluetooth/l2cap.c
	net/bridge/br_device.c
	net/bridge/br_input.c
	net/caif/Kconfig
	net/caif/cfctrl.c
	net/caif/cfrfml.c
	net/caif/cfveil.c
	net/core/dev.c
	net/core/gen_estimator.c
	net/core/netpoll.c
	net/ipv4/ip_output.c
	net/ipv4/tcp_ipv4.c
	net/netfilter/nf_conntrack_core.c
	net/netfilter/xt_TEE.c
	net/sched/act_nat.c
	sound/pci/hda/hda_intel.c
	sound/usb/endpoint.c
	sound/usb/pcm.c
	virt/kvm/iommu.c