diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-20 20:16:27 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-20 20:16:27 -0700 |
| commit | 84bae6c379e362aa017efd417199f51d5c2273ac (patch) | |
| tree | 9001dea5bbbee5b0bafbb8b8dfd212278d861cb7 /arch/s390/oprofile/init.c | |
| parent | 6ded2450383c5d622d3abb4d2a4d5ce8a0e8c229 (diff) | |
| parent | cc7887c3b1a08d3900160d93df4ddda5fa7f725b (diff) | |
| download | blackbird-obmc-linux-84bae6c379e362aa017efd417199f51d5c2273ac.tar.gz blackbird-obmc-linux-84bae6c379e362aa017efd417199f51d5c2273ac.zip | |
Merge tag 'imx-dt-3.7-2' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt
From Shawn Guo:
This is the second round of imx-dt patches for 3.7. It's based on
and imx-dt-3.7 and imx-clk-dt-lookup which have already been pulled.
* tag 'imx-dt-3.7-2' of git://git.linaro.org/people/shawnguo/linux-2.6:
ARM: imx6q: use pll2_pfd2_396m as the enfc_sel's parent
ARM: dts: imx6q-sabrelite: add usbotg pinctrl support
ARM: dts: imx6q-sabrelite: add usbmisc device
Diffstat (limited to 'arch/s390/oprofile/init.c')
0 files changed, 0 insertions, 0 deletions
