David S. Miller 08abe18af1 Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ ...

Conflicts:
	drivers/net/wimax/i2400m/usb-notif.c

2009-03-26 15:23:24 -07:00

..

core.c

Bluetooth: Fix RFCOMM usage of in-kernel L2CAP sockets

2009-02-27 06:14:48 +01:00

Kconfig

…

Makefile

…

sock.c

Bluetooth: Restrict application of socket options

2009-02-27 06:14:33 +01:00

tty.c

Driver core: Fix device_move() vs. dpm list ordering, v2

2009-03-24 16:38:26 -07:00