John W. Linville 515db09338 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux ...

Conflicts:
	drivers/net/wireless/iwlegacy/iwl-debugfs.c
	drivers/net/wireless/iwlegacy/iwl-rx.c
	drivers/net/wireless/iwlegacy/iwl-scan.c
	drivers/net/wireless/iwlegacy/iwl-tx.c
	include/net/bluetooth/bluetooth.h

2011-11-22 14:05:46 -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

net: rfkill: add generic gpio rfkill driver

2011-05-19 13:53:54 -04:00

Makefile

net: rfkill: add generic gpio rfkill driver

2011-05-19 13:53:54 -04:00

rfkill-gpio.c

net:rfkill: add a gpio setup function into GPIO rfkill

2011-10-03 15:19:19 -04:00

rfkill-regulator.c

rfkill: Remove unnecessary OOM logging messages

2011-09-13 15:45:02 -04:00

rfkill.h

rfkill: rewrite

2009-06-03 14:06:13 -04:00