summaryrefslogtreecommitdiffstats
path: root/net/nfc/Kconfig
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2012-10-29 14:52:04 -0400
committerJohn W. Linville <linville@tuxdriver.com>2012-10-29 14:52:04 -0400
commitd1f10302568221c20628200bc8baa426c55f61c0 (patch)
tree5eeb95d847924ec587e5e9a47ea2d2275d37635f /net/nfc/Kconfig
parent9b34f40c20111ba658f88e1669598db494be1fbc (diff)
parent1724ffbc7439de679d536163e03f54f35574d449 (diff)
downloadlinux-d1f10302568221c20628200bc8baa426c55f61c0.tar.bz2
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'net/nfc/Kconfig')
0 files changed, 0 insertions, 0 deletions