git/linux-cryptodev-2.6
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git synced 2026-05-02 18:17:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Staging: Merge 2.6.37-rc5 into staging-next

Browse Source 
This was done to handle a number of conflicts in the batman-adv
and winbond drivers properly.  It also now allows us to fix up the sysfs
attributes properly that were not in the .37 release due to them being
only in this tree at the time.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman
2010-12-07 10:47:56 -08:00
parent 03fa6fc5a6 cf7d7e5a19
commit ea3398a1ae
991 changed files with 16916 additions and 8136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/easycap/easycap.h
View File

@@ -65,9 +65,9 @@
#include <linux/errno.h>
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/smp_lock.h>
#include <linux/module.h>
#include <linux/kref.h>
#include <linux/smp_lock.h>
#include <linux/usb.h>
#include <linux/uaccess.h>