]> git.karo-electronics.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c4b76c5 0874073)
Merge remote-tracking branch 'wireless/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 29 Sep 2011 02:47:14 +0000 (12:47 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 29 Sep 2011 02:47:14 +0000 (12:47 +1000)
commite77e5bb957d36d4d20daeeda95bf7f8b652e67b8
treef03f03149248832cef90bb6492d39aa3e0fffdb2tree | snapshot
parentc4b76c5de7fc3ce7a41cb5f51e073351091aa129commit | diff
parent0874073570d9184a169a4ae2abbe8dbcb71878e9commit | diff
Merge remote-tracking branch 'wireless/master'

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
Linux kernel for KaRo TX COM modules