summaryrefslogtreecommitdiffstats
path: root/drivers/w1
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2013-06-26 20:00:11 -0400
committerJohn W. Linville <linville@tuxdriver.com>2013-06-26 20:00:11 -0400
commit59731bb8c4f1536c5b698dc1aec82d7a5cef41eb (patch)
treeb6e245cfae009fe9e108d6adaed3e0f56fd2969e /drivers/w1
parent729d8d182bbf296b32cb2e7f970801eb6ce33c6a (diff)
parentbd4ace2a36e7c87bb5f3eceb54d3b304d395dcf0 (diff)
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Diffstat (limited to 'drivers/w1')
0 files changed, 0 insertions, 0 deletions