John W. Linville 1032c736e8 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem ... Conflicts: drivers/net/wireless/b43legacy/dma.c		2012-01-05 10:13:24 -05:00
..
b43legacy.h	b43legacy: Avoid packet losses in the dma worker code	2012-01-04 14:30:43 -05:00
debugfs.c	Update my e-mail address	2011-07-07 15:18:01 +02:00
debugfs.h
dma.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2012-01-05 10:13:24 -05:00
dma.h	b43legacy: Avoid packet losses in the dma worker code	2012-01-04 14:30:43 -05:00
ilt.c	Update my e-mail address	2011-07-07 15:18:01 +02:00
ilt.h
Kconfig
leds.c	net: fix assignment of 0/1 to bool variables.	2011-12-19 22:27:29 -05:00
leds.h
main.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2012-01-05 10:13:24 -05:00
main.h	Update my e-mail address	2011-07-07 15:18:01 +02:00
Makefile
phy.c	Update my e-mail address	2011-07-07 15:18:01 +02:00
phy.h	Update my e-mail address	2011-07-07 15:18:01 +02:00
pio.c	Update my e-mail address	2011-07-07 15:18:01 +02:00
pio.h
radio.c	net: fix assignment of 0/1 to bool variables.	2011-12-19 22:27:29 -05:00
radio.h	Update my e-mail address	2011-07-07 15:18:01 +02:00
rfkill.c	Update my e-mail address	2011-07-07 15:18:01 +02:00
rfkill.h
sysfs.c	Update my e-mail address	2011-07-07 15:18:01 +02:00
sysfs.h
xmit.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-07-25 13:56:39 -07:00
xmit.h