summaryrefslogtreecommitdiff
path: root/net/sctp/tsnmap.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-07-10 15:41:13 (GMT)
committerArnd Bergmann <arnd@arndb.de>2012-07-10 15:41:13 (GMT)
commit4450cb7d586c3d8f6615ee437eab1d1e064b20c0 (patch)
tree542ad0a042e52a0fafc6a2fd70e04b7aa795526a /net/sctp/tsnmap.c
parent99ac7b577fb5b2d46b35b6f52540a535466e030a (diff)
parent79ab2664336d73245023a236345bb31f2b0a2dfe (diff)
downloadlinux-fsl-qoriq-4450cb7d586c3d8f6615ee437eab1d1e064b20c0.tar.xz
Merge tag 'omap-devel-am33xx-data-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/clk
From Tony Lindgren <tony@atomide.com>: This branch adds clock data for am33xx. Note that eventually these will use the common clock framework, but those patches are not quite ready yet for omaps. This branch depends on omap-cleanup-part2-for-v3.6 branch. * tag 'omap-devel-am33xx-data-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP3+: clock33xx: Add AM33XX clock tree data ARM: OMAP3+: clock: Move common clksel_rate & clock data to common file Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'net/sctp/tsnmap.c')
0 files changed, 0 insertions, 0 deletions