diff options
author | Olof Johansson <olof@lixom.net> | 2013-07-22 19:53:29 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-07-22 19:54:22 -0700 |
commit | 9d0b375089284186116a0745d862ec713f920d9e (patch) | |
tree | 82e6b8949f0cceeec848370d934947c95a8beee0 /lib/cordic.c | |
parent | cc23ee49d36fe5ce1435f75e5312bee9d76010c2 (diff) | |
parent | 7956c487e407bdbf7f8c8a570fd5d4d089973692 (diff) |
Merge tag 'omap-for-v3.11/fixes-against-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
From Tony Lindgren:
Omap fixes mostly to deal with the dropping of platform data for omap4,
and to make v7_defconfig bootable on omap4 SDP with nfsroot.
* tag 'omap-for-v3.11/fixes-against-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP2+: Provide alias to USB PHY clock
ARM: dts: Add missing vmmc2 regulator for twl
ARM: multi_v7: Enabled omap4430 sdp nfsroot
Diffstat (limited to 'lib/cordic.c')
0 files changed, 0 insertions, 0 deletions