summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2012-07-05 15:18:04 (GMT)
committerTony Lindgren <tony@atomide.com>2012-07-05 15:18:04 (GMT)
commit79ab2664336d73245023a236345bb31f2b0a2dfe (patch)
tree16fb7f77074a39b74aecbf324b0b7de2eaf6d094 /include
parentecc46cfdad7499a21296f0757059c4965f1fbc98 (diff)
parente30384abd63dfa11508a38243e1d78f1d70486b1 (diff)
downloadlinux-79ab2664336d73245023a236345bb31f2b0a2dfe.tar.xz
Merge tag 'omap-devel-e-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into devel-am33xx-data
OMAP AM33xx clock data Conflicts: arch/arm/mach-omap2/Makefile
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions