projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 56fd49e 0874073)
Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 30 Sep 2011 18:52:16 +0000 (14:52 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 30 Sep 2011 18:52:29 +0000 (14:52 -0400)
commit8e00f5fbb4ecbc3431fa686cba60cd76a62604af
tree78aa3bdef892dbd1afc8969fc528e529cfc266f7tree | snapshot
parent56fd49e399ce1d82200fad5b8924d4e35a587809commit | diff
parent0874073570d9184a169a4ae2abbe8dbcb71878e9commit | diff
Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into for-davem

Conflicts:
drivers/net/wireless/iwlwifi/iwl-pci.c
drivers/net/wireless/wl12xx/main.c
MAINTAINERS diff1 | diff2 | blob | history
net/mac80211/cfg.c diff1 | diff2 | blob | history
net/mac80211/ibss.c diff1 | diff2 | blob | history
net/mac80211/iface.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.