Subject: linux-next: manual merge of the sound tree with the arm tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 22 Jul 2010 11:28:31 +1000

Hi Takashi,

Today's linux-next merge of the sound tree got a conflict in
arch/arm/mach-ep93xx/clock.c between commit
a99b53f80962ed98f4b598dc22f8c030b5dae55a ("ARM: AMBA: Add pclk support to
AMBA bus infrastructure") from the arm tree and commit
ed67ea82c0d9a163458dc6a69a7a3123db1a8b3b ("EP93xx: Add i2s core support")
from the sound tree.

Just context changes.  I fixed it up (it was just a blank line) and can
carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/