lkml.org 
[lkml]   [2009]   [Dec]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the watchdog tree with the tree
Hi Wim,

Today's linux-next merge of the watchdog tree got a conflict in
drivers/watchdog/rm9k_wdt.c between commit
de4148f3ef54b644a181ad75a6fb4b373f2b01f0 ("MIPS: eXcite: Remove
platform") from Linus' tree and commit
f277223000a651df741e2e3367b498049139298d ("[WATCHDOG] use resource_size
()") from the watchdog tree.

The former commit removes the file changed by the latter. I just removed
the file.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2009-12-23 23:21    [W:0.042 / U:1.880 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site