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/iwlwifi/iwl-core.c
	drivers/net/wireless/rt2x00/rt2x00queue.c
	drivers/net/wireless/rt2x00/rt2x00queue.h

...

This commit is contained in:

John W. Linville 2011-04-25 14:34:25 -04:00

parent b71d1d426d 73b48099cc

commit cfef6047c4

192 changed files with 7199 additions and 5933 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

130

include/net/bluetooth/l2cap.h

View file

33

include/net/cfg80211.h

View file

16

include/net/mac80211.h

View file