diff --git a/[refs] b/[refs] index c0b993519440..9a894386f1a6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5ca307b28d6fa12f46b4ad32cb4bb854f8ee69c3 +refs/heads/master: 65d11d95515db3efb629202104cfc672476618b5 diff --git a/trunk/sound/core/timer.c b/trunk/sound/core/timer.c index 56bd383a06c2..4104f6e292e9 100644 --- a/trunk/sound/core/timer.c +++ b/trunk/sound/core/timer.c @@ -1562,8 +1562,8 @@ static int snd_timer_user_params(struct file *file, snd_timer_params_t __user *_ (1<