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

…

input.c

…

Kconfig

…

Makefile

…

rfkill-gpio.c

net/rfkill/rfkill-gpio.c: introduce missing kfree

2012-01-04 14:30:46 -05:00

rfkill-regulator.c

…

rfkill.h

…