Messages in this thread | | | Date | Wed, 23 Feb 2011 14:34:46 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the watchdog tree with the sh tree |
| |
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@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |