Johan Hedberg 46479e6985 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next.git
Conflicts:
	include/net/bluetooth/l2cap.h
	net/bluetooth/hci_conn.c
	net/bluetooth/l2cap_core.c
2012-02-16 14:25:34 +02:00
..
2012-01-23 15:11:27 -08:00
2012-01-24 10:25:03 -08:00
2012-01-14 15:07:24 -08:00
2012-01-23 08:44:53 -08:00
2012-01-18 12:35:17 -08:00
2012-01-13 10:12:23 -08:00
2012-01-11 23:58:47 -05:00