Hi Wim,
Today's linux-next merge of the watchdog tree got a conflict in
drivers/watchdog/shwdt.c between commits b1fa888e0124 ("watchdog: shwdt:
Kill off mmap stub and superfluous comments") and 8f5585ec3d17
("watchdog: shwdt: driver model conversion") from the sh tree and commit
e273d97a2281 ("watchdog: cleanup spaces before tabs") from the watchdog
tree.
The spaces seem to have been cleaned up in the former patches, so I used
the sh tree version of this file.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpZS2hVs3IKx.pgp
Description: PGP signature
