linux-next: firmware/bkl-removal merge conflict

Hi David,

Today's linux-next merge of the firmware tree got a trivial conflict in
drivers/char/ip2/ip2main.c between commit
023c37d20b8a85438869f22e962bbf905644883f ("Add a bunch of
cycle_kernel_lock() calls") form the bkl-removal tree and commit
6d28e8abf294260b52efd1ba1d59ced169ba4a7a ("ip2: use request_firmware()")
from the firmware tree.

It was just a case of overlapping additions of includes.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/