diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-02-22 16:56:50 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-02-22 16:57:00 -0500 |
| commit | 9bde36afcaf0ec2ad9f03974da41875c759a4fe8 (patch) | |
| tree | 5b6f2fd6c86d5dadaf427c302ed35f738c2be55b /drivers/watchdog/sch311x_wdt.c | |
| parent | f020c39e51b1ef8389d5cf38190d32f55ff9d556 (diff) | |
| parent | c9e358dfc4a8cb2227172ef77908c2e0ee17bcb9 (diff) | |
Merge branch 'devicetree/next' into spi/next
To pick up removal of #ifdef around .of_match_table
Diffstat (limited to 'drivers/watchdog/sch311x_wdt.c')
0 files changed, 0 insertions, 0 deletions