Merge branch 'master' into upstream

This commit is contained in:
Jiri Kosina
2010-12-10 15:19:18 +01:00
6828 changed files with 694467 additions and 331436 deletions

View File

@@ -29,7 +29,6 @@
#include <linux/slab.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/smp_lock.h>
#include <linux/input.h>
#include <linux/usb.h>
#include <linux/hid.h>