summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/sc520_wdt.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-01-19 11:43:42 -0800
committerDavid S. Miller <davem@davemloft.net>2010-01-19 11:43:42 -0800
commit6373464288cab09bc641be301d8d30fc9f64ba71 (patch)
treec1bc92dc630aa15da2e12bc0d09c92169817a702 /drivers/watchdog/sc520_wdt.c
parent6d955180b2f9ccff444df06265160868cabb289a (diff)
parent730dd70549e0ec755dd55615ba5cfc38a482a947 (diff)
downloadop-kernel-dev-6373464288cab09bc641be301d8d30fc9f64ba71.zip
op-kernel-dev-6373464288cab09bc641be301d8d30fc9f64ba71.tar.gz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Conflicts: drivers/net/wireless/iwlwifi/iwl-core.h
Diffstat (limited to 'drivers/watchdog/sc520_wdt.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud