lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source 
Conflicts:
	drivers/net/bnx2x/bnx2x.h
This commit is contained in:
David S. Miller
2011-03-03 21:27:42 -08:00
parent 01a16b21d6 b65a0e0c84
commit 0a0e9ae1bd
358 changed files with 3323 additions and 1984 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/bluetooth/btusb.c
View File

@@ -1043,8 +1043,6 @@ static int btusb_probe(struct usb_interface *intf,
usb_set_intfdata(intf, data);
usb_enable_autosuspend(interface_to_usbdev(intf));
return 0;
}