git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 22c8c93 f70490e)

author	John W. Linville <linville@tuxdriver.com>
	Fri, 24 Jun 2011 19:25:51 +0000 (15:25 -0400)
committer	John W. Linville <linville@tuxdriver.com>
	Fri, 24 Jun 2011 19:25:51 +0000 (15:25 -0400)
commit	36099365c7cc64e5184b66b6eb094950a13f540c
tree	c91b9f3719f94864a62f2d15a71aaecd54c56711	tree \| snapshot
parent	22c8c9343258feda9ea9ebb9e5f8cbb727b69454	commit \| diff
parent	f70490e6078abe1182437e629f67a7f0b6f08cd4	commit \| diff

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next-2.6 into for-davem

Conflicts:
drivers/net/wireless/rtlwifi/pci.c
include/linux/netlink.h

14 files changed:

drivers/bcma/host_pci.c	diff1 \|	diff2 \|	blob \| history
drivers/net/b44.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath5k/base.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/ath9k.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/init.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/recv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/b43/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlegacy/iwl-dev.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-dev.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/if_spi.c	diff1 \|	diff2 \|	blob \| history
include/linux/netlink.h	diff1 \|	diff2 \|	blob \| history
include/net/bluetooth/hci_core.h	diff1 \|	diff2 \|	blob \| history
net/bluetooth/hci_core.c	diff1 \|	diff2 \|	blob \| history
net/netlink/af_netlink.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree