Merge branch 'fixes-rc2' into omap-for-v4.6/fixes
authorTony Lindgren <tony@atomide.com>
Fri, 8 Apr 2016 16:18:00 +0000 (09:18 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 8 Apr 2016 16:18:00 +0000 (09:18 -0700)
commit19e831b272e6db5884be085be66e44da975c73a9
tree8812543bc66dc531e4720f5119107e7de3447a46
parent6f40fed1c911f218e1e189a404b26ef19effabb5
parent571afb4c8a4bbe88541364e7f6827340562f2736
Merge branch 'fixes-rc2' into omap-for-v4.6/fixes
arch/arm/mach-omap2/id.c
arch/arm/mach-omap2/io.c