]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: be4ea8d 2daac8a)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 25 Aug 2010 18:51:42 +0000 (14:51 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 25 Aug 2010 18:51:42 +0000 (14:51 -0400)
commit55a52355b83dde7bd399760441962e64997fba9a
treeeaedc03d42ee2bf6200fc07b080a99bad103def3tree | snapshot
parentbe4ea8d64387ef053948fb920a4db38100aa99a1commit | diff
parent2daac8ae01dbbdeaf2ba11bb9a4da250a500f5f1commit | diff
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

Conflicts:
drivers/net/wireless/libertas/if_sdio.c
14 files changed:
Documentation/DocBook/Makefile diff1 | diff2 | blob | history
drivers/net/wireless/b43/phy_n.c diff1 | diff2 | blob | history
drivers/net/wireless/ipw2x00/ipw2100.c diff1 | diff2 | blob | history
drivers/net/wireless/libertas/cfg.c diff1 | diff2 | blob | history
drivers/net/wireless/libertas/if_cs.c diff1 | diff2 | blob | history
drivers/net/wireless/libertas/if_sdio.c diff1 | diff2 | blob | history
drivers/net/wireless/libertas/if_usb.c diff1 | diff2 | blob | history
drivers/net/wireless/libertas_tf/if_usb.c diff1 | diff2 | blob | history
drivers/net/wireless/rt2x00/rt2500usb.c diff1 | diff2 | blob | history
drivers/net/wireless/rt2x00/rt2800lib.c diff1 | diff2 | blob | history
drivers/net/wireless/rt2x00/rt2x00queue.c diff1 | diff2 | blob | history
drivers/net/wireless/rt2x00/rt61pci.c diff1 | diff2 | blob | history
drivers/net/wireless/rt2x00/rt73usb.c diff1 | diff2 | blob | history
include/linux/netdevice.h diff1 | diff2 | blob | history
Linux Kernel Source Tree.