[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20131216115733.16a652c0e350453d94c8551a@canb.auug.org.au>
Date: Mon, 16 Dec 2013 11:57:33 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Jean Delvare <khali@...ux-fr.org>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: manual merge of the jdelvare-hwmon tree with Linus'
tree
Hi Jean,
Today's linux-next merge of the jdelvare-hwmon tree got a conflict in
drivers/hwmon/lm90.c between commits from Linus' tree and commits from
the jdelvare-hwmon tree.
It looks like the jdelvare-hwmon patch series has been reset back
(unintentionally?) to stuff that has already been merged into Linus'
tree ... so I just used the version from Linus' tree.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists