lkml.org 
[lkml]   [2010]   [Aug]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the genesis tree with Linus' tree
Hi Paul,

Today's linux-next merge of the genesis tree got a conflict in
drivers/net/irda/sh_irda.c between commit
752ef8b541da2606c5668dcc176e7b16dd68b945 ("drivers: irda: fix sign bug")
from Linus' tree and commit 8a2b6beffc88b83089845d72eed2ed74eb5c9b1e
("net/irda/sh_irda: Modify clk_get lookups") from the genesis tree.

Just context changes. I fixed it up (trivially) and can carry the fix
for a while.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

diff --cc drivers/net/irda/sh_irda.c
index edd5666,9db7084..0000000
--- a/drivers/net/irda/sh_irda.c
+++ b/drivers/net/irda/sh_irda.c
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2010-08-05 02:55    [W:0.022 / U:1.408 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site