Subject: linux-next: manual merge of the firmware tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 24 Jun 2008 16:55:08 +1000

Hi David,

Today's linux-next merge of the firmware tree got a conflict in
drivers/net/Kconfig between commit
158d7abdae85e9ac43d99780c372d79c119f7626 ("tg3: Add mdio bus
registration") from the  tree and commit
b0dc4db2e4d4491ae35c286f1a0a632ee12d5d76 ("firmware: convert tg3 driver
to request_firmware()") from the firmware tree.

Just a case of overlapping additions of SELECTs.  I took them both.

-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/