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

From: Stephen Rothwell <[email-masked]>
Date: Tue, 18 Nov 2008 11:51:46 +1100

Hi Dave,

Today's linux-next merge of the net tree got a conflict in
drivers/isdn/i4l/isdn_net.c between commit
584c650b4e6fa16f9ab45d382f86ad6d9c625227 ("isdn: remove extra byteswap in
isdn_net_ciscohdlck_slarp_send_reply") from the net-current tree and
commit 00bcd522ea0a62f5e2a9c6ad4924cbbd8d05b026 ("isdn: use %pI4, remove
get_{u8/u16/u32} and put_{u8/u16/u32} inlines") from the net tree.

I fixed it up by using the version from the net tree.  I assume that this
will be fixed in that tree shortly.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/