diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2011-10-05 10:52:27 -0600 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2011-10-05 10:52:27 -0600 |
commit | 9514a56753a8d379db36bed424588e1842f2bfcc (patch) | |
tree | d13cdfcd9473f521c3b108770dba57e81e557a30 /drivers/watchdog/imx2_wdt.c | |
parent | 4cd7f7a31178ff8a15ad2bc1258b9b2bf2cf51a4 (diff) | |
parent | 6add6967a4a57e2156b96e62f28bcbe1901d16c1 (diff) | |
download | blackbird-obmc-linux-9514a56753a8d379db36bed424588e1842f2bfcc.tar.gz blackbird-obmc-linux-9514a56753a8d379db36bed424588e1842f2bfcc.zip |
Merge branch 'for-grant' of git://git.jdl.com/software/linux-3.0 into devicetree/next
Diffstat (limited to 'drivers/watchdog/imx2_wdt.c')
0 files changed, 0 insertions, 0 deletions