linux/net/bluetooth
Linus Torvalds 60d2c25251 Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
Pull HID fixes from Jiri Kosina:
 "The most important one is a purification of Kconfig for CONFIG_HID;
  the inclusion of HID groups and autoloading didn't leave the Kconfig
  in a really consistent state.  Henrik's patch fixes that.  In addition
  to that, there are two small fixes for logitech and magicmouse
  drivers."

* 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: Fix the generic Kconfig options
  HID: magicmouse: Correct report range of major / minor axes
  HID: logitech: don't use stack based dj_report structures
2012-06-26 11:23:41 -07:00
..
bnep Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next 2012-05-22 15:18:06 -04:00
cmtp Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
hidp HID: Fix the generic Kconfig options 2012-06-25 17:25:00 +02:00
rfcomm tty: Revert the tty locking series, it needs more work 2012-06-02 15:21:43 -07:00
af_bluetooth.c Bluetooth: Fix checking the wrong flag when accepting a socket 2012-06-05 06:26:26 +03:00
hci_conn.c Bluetooth: Remove unused hci_le_ltk_neg_reply() 2012-05-09 01:40:51 -03:00
hci_core.c Bluetooth: Fix packet size provided to the controller 2012-05-16 16:12:49 -03:00
hci_event.c Bluetooth: Report proper error number in disconnection 2012-05-16 16:14:24 -03:00
hci_sock.c Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2012-03-29 18:12:23 -07:00
hci_sysfs.c Bluetooth: trivial: Correct types 2012-05-09 00:41:31 -03:00
Kconfig Bluetooth: Fix Kconfig help description 2012-02-29 18:50:25 +02:00
l2cap_core.c Bluetooth: Create flags for bt_sk() 2012-05-16 16:14:17 -03:00
l2cap_sock.c Bluetooth: Create flags for bt_sk() 2012-05-16 16:14:17 -03:00
lib.c Bluetooth: Add logging functions bt_info and bt_err 2012-02-17 11:33:17 +02:00
Makefile Bluetooth: Always compile SCO and L2CAP in Bluetooth Core 2011-12-21 02:21:08 -02:00
mgmt.c Bluetooth: Fixed checkpatch warnings 2012-05-09 03:06:09 -03:00
sco.c Bluetooth: Add dst_type parameter to hci_connect 2012-05-09 01:40:45 -03:00
smp.c Bluetooth: Correct ediv in SMP 2012-05-09 00:41:30 -03:00