]> git.karo-electronics.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8610f5b 0874073)
Merge remote-tracking branch 'wireless/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 Sep 2011 01:26:15 +0000 (11:26 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 Sep 2011 01:26:15 +0000 (11:26 +1000)
commit09be3fe7d7205c4bb75c140ae98a0d527b6a1e18
tree8f29b2896c0903cb76432aec3957e2b031be3ae4tree | snapshot
parent8610f5b3d23f904d9a0b186821d9dd7bd1766139commit | 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