git.cascardo.info Git - cascardo/linux.git/commit

projects / cascardo / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 4562487 268bae0)

author	John W. Linville <linville@tuxdriver.com>
	Wed, 25 Aug 2010 18:51:42 +0000 (14:51 -0400)
committer	John W. Linville <linville@tuxdriver.com>
	Wed, 25 Aug 2010 18:51:42 +0000 (14:51 -0400)
commit	e569aa78ba01f7f66e016a4d57310fd041524d17
tree	eaedc03d42ee2bf6200fc07b080a99bad103def3	tree \| snapshot
parent	4562487a00445eab96311365ba15c41dc4d043cd	commit \| diff
parent	268bae0b6879f238ba57f5f801958d1254e136f7	commit \| diff

Merge branch 'master' of git://git./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

Unnamed repository; edit this file 'description' to name the repository.