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

From: Stephen Rothwell <[email-masked]>
Date: Mon, 15 Dec 2008 15:25:09 +1100

Hi Takashi,

Today's linux-next merge of the sound tree got a conflict in
sound/drivers/pcsp/pcsp.c between commit
ca109491f612aab5c8152207631c0444f63da97f ("hrtimer: removing all ur
callback modes") from the timers tree and commit
8a75f4fb28766878893b4335f4b5743ce9b931fe ("ALSA: pcsp - Use
HRTIMER_CB_IRQSAFE_UNLOCKED") from the sound tree.

The former removed the line that the latter modified.  I just removed the
line and can carry this fix as necessary.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/