Merge commit 'v2.6.34-rc6' into core/locking

This commit is contained in:
Ingo Molnar
2010-05-03 09:17:01 +02:00
8855 changed files with 419700 additions and 178252 deletions

View File

@@ -34,7 +34,6 @@
#include <linux/module.h>
#include <linux/init.h>
#include <linux/gameport.h>
#include <linux/slab.h>
#define L4_PORT 0x201
#define L4_SELECT_ANALOG 0xa4