summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2012-09-24 14:34:40 -0400
committerJohn W. Linville <linville@tuxdriver.com>2012-09-24 14:34:40 -0400
commit9b4e9e756541fd5d1223b323ed5a8a8545dd11cd (patch)
tree3eed3a2582532bd1fd890b58eadd472fcd2b1dc7 /drivers/watchdog
parent7a5f799becc51c842ec1a3aeb8dd82651aea7036 (diff)
parent9385d04f2872057a2029901190391fe192b18693 (diff)
downloadlinux-9b4e9e756541fd5d1223b323ed5a8a8545dd11cd.tar.bz2
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'drivers/watchdog')
0 files changed, 0 insertions, 0 deletions