diff options
| author | Olof Johansson <olof@lixom.net> | 2013-06-14 14:25:37 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-06-14 14:26:06 -0700 |
| commit | 214099b028f42c48461fb2a08e5b8ab419558cbd (patch) | |
| tree | 8258236e4e5ad01ce5def50dc75b0bfd9ea354bb /lib/int_sqrt.c | |
| parent | 4abbb75b6d77dc3d48d18abfc2d75c652cf432e3 (diff) | |
| parent | 03c0d27119296bb32ef4a075b9fb8bb0aeaa19c0 (diff) | |
| download | linux-214099b028f42c48461fb2a08e5b8ab419558cbd.tar.gz linux-214099b028f42c48461fb2a08e5b8ab419558cbd.tar.bz2 linux-214099b028f42c48461fb2a08e5b8ab419558cbd.zip | |
Merge tag 'omap-for-v3.10/fixes-v3.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup
Pulling in a set of fixes from Tony Lindgren to resolve conflicts with later
cleanup branch:
A set of small fixes for omaps for the -rc cycle:
- am7303 iva2 reset PM regression fix
- am33xx uart2 dma channel fix
- am33xx gpmc properties fix
- omap44xx rtc wake-up mux fix for nirq pins
- omap36xx clock divider restore fix
There's also one tiny non-critical .dts fix for omap5
timer pwm properties.
* tag 'omap-for-v3.10/fixes-v3.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: omap3: clock: fix wrong container_of in clock36xx.c
ARM: dts: OMAP5: Fix missing PWM capability to timer nodes
ARM: dts: omap4-panda|sdp: Fix mux for twl6030 IRQ pin and msecure line
ARM: dts: AM33xx: Fix properties on gpmc node
arm: omap2: fix AM33xx hwmod infos for UART2
+ Linux 3.10-rc4
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'lib/int_sqrt.c')
0 files changed, 0 insertions, 0 deletions