linux-next: manual merge of the genesis tree with Linus' tree

From: Stephen Rothwell
Date: Wed Aug 04 2010 - 20:53:40 EST

Hi Paul,

Today's linux-next merge of the genesis tree got a conflict in
drivers/net/irda/sh_irda.c between commit
752ef8b541da2606c5668dcc176e7b16dd68b945 ("drivers: irda: fix sign bug")
from Linus' tree and commit 8a2b6beffc88b83089845d72eed2ed74eb5c9b1e
("net/irda/sh_irda: Modify clk_get lookups") from the genesis tree.

Just context changes. I fixed it up (trivially) and can carry the fix
for a while.
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/net/irda/sh_irda.c
index edd5666,9db7084..0000000
--- a/drivers/net/irda/sh_irda.c
+++ b/drivers/net/irda/sh_irda.c

Attachment: pgp00000.pgp
Description: PGP signature