diff options
author | John W. Linville <linville@tuxdriver.com> | 2011-11-09 20:49:23 +0100 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-11-09 20:49:23 +0100 |
commit | 5e819059a20b0fc5a71875f28b4cae359e38d85a (patch) | |
tree | b94a18142abc5e60c84f90ee2490e8a6af01c2a9 /drivers/usb/gadget/uvc_video.c | |
parent | mac80211: allow frame aggregation for mesh (diff) | |
parent | wl12xx: fix wl12xx_scan_sched_scan_ssid_list() check that all given ssids are... (diff) | |
download | linux-5e819059a20b0fc5a71875f28b4cae359e38d85a.tar.xz linux-5e819059a20b0fc5a71875f28b4cae359e38d85a.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers/usb/gadget/uvc_video.c')
-rw-r--r-- | drivers/usb/gadget/uvc_video.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/gadget/uvc_video.c b/drivers/usb/gadget/uvc_video.c index b08f35438d70..b0e53a8ea4f7 100644 --- a/drivers/usb/gadget/uvc_video.c +++ b/drivers/usb/gadget/uvc_video.c @@ -8,7 +8,6 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * */ #include <linux/kernel.h> |