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

Merge branch 'for-next' into for-linus

Browse Source 
Conflicts:

	kernel/irq/chip.c
This commit is contained in:
Jiri Kosina
2009-12-07 18:36:35 +01:00
parent 6ec22f9b03 6070d81eb5
commit d014d04386
490 changed files with 721 additions and 832 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/usb/class/usbtmc.c
View File

@@ -1,5 +1,5 @@
/**
* drivers/usb/class/usbtmc.c - USB Test & Measurment class driver
* drivers/usb/class/usbtmc.c - USB Test & Measurement class driver
*
* Copyright (C) 2007 Stefan Kopp, Gechingen, Germany
* Copyright (C) 2008 Novell, Inc.