| commit | d7235b8b92e7f7bdff8d1af9981773c29537a7de | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Tue Sep 18 07:40:02 2012 -0700 |
| committer | Olof Johansson <olof@lixom.net> | Tue Sep 18 07:40:02 2012 -0700 |
| tree | 6fe09a729049e72dc007b71cdea02fabdff73fee | |
| parent | 5698bd757d55b1bb87edd1a9744ab09c142abfc2 [diff] | |
| parent | d6838a62b4d36d3e2791cffe155586973b20a381 [diff] |
Merge branch 'v3.6-samsung-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
* '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