Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	net/mac80211/main.c
This commit is contained in:
David S. Miller
2010-09-09 22:27:33 -07:00
774 changed files with 11148 additions and 12678 deletions

View File

@@ -124,7 +124,7 @@ struct if_sdio_card {
bool helper_allocated;
bool firmware_allocated;
u8 buffer[65536];
u8 buffer[65536] __attribute__((aligned(4)));
spinlock_t lock;
struct if_sdio_packet *packets;