linux-next: manual merge of the firmware tree
From: Stephen Rothwell <hidden>
Date: 2008-07-07 16:02:29
Hi David,
Today's linux-next merge of the firmware tree got a conflict in
include/linux/firmware.h between commit
69d44a1835ec8163a82c4ee57367f87ae0f85c2e ("firmware: fix the
request_firmware() dummy") from Linus' tree and commit
81d4e79acbda3c3f8cbdcc7284b643083314e9c8 ("firmware: allow firmware files
to be built into kernel image") from the firmware tree.
It was just contextual.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/ Attachments
- (unnamed) [application/pgp-signature] 197 bytes