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

From: Stephen Rothwell <[email-masked]>
Date: Mon, 30 Jun 2008 19:14:27 +1000

Hi David,

Today's linux-next merge of the firmware tree got a conflict in
drivers/atm/Makefile between commit
e92481f95375aa2702ea5018b0295792ae0fa9c1 ("atm: [fore200e] convert to use
request_firmware()") from the net tree and commit
1bf8d922fe44bdec0126f8cc2e3477c8bc044c3f ("firmware: convert Ambassador
ATM driver to request_firmware()") from the firmware tree.

I fixed it up (just overlapping removals).

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