Merge branch 'v3.6-samsung-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Tue, 18 Sep 2012 14:40:02 +0000 (07:40 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 18 Sep 2012 14:40:02 +0000 (07:40 -0700)
* 'v3.6-samsung-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: SAMSUNG: Use spin_lock_{irqsave,irqrestore} in clk_set_rate
  ARM: SAMSUNG: use spin_lock_irqsave() in clk_set_parent


Trivial merge