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
..
core.c	net/rfkill/core.c: use kstrtoul, etc	2011-11-09 16:14:10 -05:00
input.c	net: add moduleparam.h for users of module_param/MODULE_PARM_DESC	2011-10-31 19:30:29 -04:00
Kconfig
Makefile
rfkill-gpio.c	net/rfkill/rfkill-gpio.c: introduce missing kfree	2012-01-04 14:30:46 -05:00
rfkill-regulator.c	net: fix assignment of 0/1 to bool variables.	2011-12-19 22:27:29 -05:00
rfkill.h