Merge remote branch 'wireless-next/master' into ath6kl-next

Conflicts:
	drivers/net/wireless/ath/ath6kl/init.c
This commit is contained in:
Kalle Valo
2011-12-16 21:10:39 +02:00
7655 changed files with 342408 additions and 170690 deletions

View File

@@ -19,6 +19,7 @@
#include <linux/circ_buf.h>
#include <linux/fs.h>
#include <linux/vmalloc.h>
#include <linux/export.h>
#include "debug.h"
#include "target.h"