Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

Browse source

Conflicts:
	drivers/net/wireless/libertas_tf/cmd.c
	drivers/net/wireless/libertas_tf/main.c

...

This commit is contained in:

John W. Linville 2010-05-05 16:14:16 -04:00

parent 0a12761bcd adfba3c7c0

commit 83163244f8

140 changed files with 4751 additions and 1368 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

5

include/linux/nl80211.h

View file

4

include/linux/ssb/ssb.h

View file

15

include/linux/ssb/ssb_driver_chipcommon.h

View file

239

include/linux/ssb/ssb_regs.h

View file