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

From: Stephen Rothwell <[email-masked]>
Date: Tue, 8 Jul 2008 17:27:11 +1000

Hi Krzysztof,

Today's linux-next merge of the hdlc tree got a conflict in
drivers/net/wan/pc300_drv.c between commit
198191c4a7ce4daba379608fb38b9bc5a4eedc61 ("WAN: convert drivers to use
built-in netdev_stats") from the net tree and commit
e693f93d7b291ae6a774728c35bd1c7969f1782a ("WAN: Convert PC300 driver to
use normal u8/u16/u32 types") from the hdlc tree.

Just contextual conflicts.  I used the hdlc tree's version.

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