Samuel Ortiz 44b3decb41 rfkill: Add NFC to the list of supported radios ...

And return the proper string for it.

Acked-by: Johannes Berg <johannes@sipsolutions.net>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

2013-04-12 16:54:38 +02:00

..

acpi

Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac

2013-02-28 20:42:33 -08:00

asm-generic

Merge tag 'metag-v3.9-rc1-v4' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag

2013-03-03 12:06:09 -08:00

clocksource

Merge tag 'metag-v3.9-rc1-v4' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag

2013-03-03 12:06:09 -08:00

crypto

…

drm

…

keys

…

linux

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

2013-04-10 14:09:54 -04:00

math-emu

…

media

…

memory

…

misc

…

net

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

2013-04-10 14:09:54 -04:00

pcmcia

…

ras

…

rdma

…

rxrpc

…

scsi

Merge tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

2013-03-02 11:42:16 -08:00

sound

Merge tag 'late-omap' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2013-02-28 20:00:40 -08:00

target

…

trace

Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

2013-03-02 19:33:21 -08:00

uapi

rfkill: Add NFC to the list of supported radios

2013-04-12 16:54:38 +02:00

video

Merge tag 'disintegrate-fbdev-20121220' of git://git.infradead.org/users/dhowells/linux-headers

2013-03-03 14:24:59 -08:00

xen

…

Kbuild

…