git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 7690fbe ed46fdf)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 27 Sep 2011 02:51:12 +0000 (12:51 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 27 Sep 2011 02:51:12 +0000 (12:51 +1000)
commit	29e0b45483100adb8454e79caf97392aa96d94e8
tree	2903d030ffc9aace6f57ede54c88cf9267b829e7	tree \| snapshot
parent	7690fbe7ebafae8deb3a32df87fbb09270db6cc3	commit \| diff
parent	ed46fdfc54d2d4523fdd727708fe0b9e2be993cc	commit \| 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
drivers/net/wireless/iwlwifi/iwl-scan.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/ibss.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/iface.c	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules