[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20130402130044.ddacc1c990698bd416e4c808@canb.auug.org.au>
Date: Tue, 2 Apr 2013 13:00:44 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Samuel Ortiz <sameo@...ux.intel.com>,
"John W. Linville" <linville@...driver.com>
Subject: linux-next: manual merge of the net-next tree with the wireless
tree
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
drivers/nfc/microread/mei.c between commit 9593b0b1179c ("NFC: microread:
Fix build failure due to a new MEI bus API") from the wireless tree and
commit 63cd353c34a0 ("NFC: microread: Fix MEI build failure") from the
net-next tree.
I fixed it up (using the wireless tree version) and can carry the fix as
necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists