summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/alim1535_wdt.c
diff options
context:
space:
mode:
authorKalle Valo <kvalo@qca.qualcomm.com>2012-03-05 19:32:58 +0200
committerKalle Valo <kvalo@qca.qualcomm.com>2012-03-05 19:32:58 +0200
commit05e5bd0f3daddb0368a433af5b58be68c62dc365 (patch)
treea54c90523b72fb6e61b7bfe01fb8917e16825781 /drivers/watchdog/alim1535_wdt.c
parentdaa16bc52ad8e9513506fca29a038a1460e63638 (diff)
parentc288ec614e264b46853c65d3db9ccf91d53c9484 (diff)
downloadtalos-op-linux-05e5bd0f3daddb0368a433af5b58be68c62dc365.tar.gz
talos-op-linux-05e5bd0f3daddb0368a433af5b58be68c62dc365.zip
Merge remote branch 'wireless-next/master' into ath6kl-next
Conflicts: drivers/net/wireless/ath/ath6kl/cfg80211.c
Diffstat (limited to 'drivers/watchdog/alim1535_wdt.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud