diff options
| author | Olof Johansson <olof@lixom.net> | 2012-05-09 23:47:14 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-05-09 23:47:14 -0700 |
| commit | bd69e27304e754b18dd6be8d8575af37afbbd095 (patch) | |
| tree | a3c549bf42531ecaaccf6ecc3b5200ff41f31f2f /mm/page_io.c | |
| parent | f7269a825cde879355bd15778012d2c3fb2ff778 (diff) | |
| parent | 563da21b1d1878736905bbff0f096fcd960d57c5 (diff) | |
Merge branch 'for-3.5/usb-ulpi' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/drivers
By Stephen Warren (30) and others
via Stephen Warren
* 'for-3.5/usb-ulpi' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra: (7 commits)
ARM: dt: tegra: pinmux changes for USB ULPI
ARM: tegra: add USB ULPI PHY reset GPIO to device tree
ARM: tegra: don't hard-code USB ULPI PHY reset_gpio
ARM: tegra: change pll_p_out4's rate to 24MHz
ARM: tegra: fix pclk rate
ARM: tegra: reparent sclk to pll_c_out1
ARM: tegra: Add pllc clock init table
+ depends/pinctrl/mergebase branch
Pinctrl mergebase has a conflict in drivers/pinctrl/core.c that was resolved.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'mm/page_io.c')
0 files changed, 0 insertions, 0 deletions