aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/mcbsp.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-10-30 17:09:09 -0400
committerArnd Bergmann <arnd@arndb.de>2011-10-30 17:09:09 -0400
commit6a8d2e2b504ce3d12cfa3934f545c9415441a5c3 (patch)
tree4653cae49b03dda61c04369d44153d7dbfebe1cc /arch/arm/mach-omap2/mcbsp.c
parent56e2d8a68803be438211130f58ff02c277a2daaf (diff)
parent9daaf31a8cc9c98751b7b71198307e47d5bf6a4d (diff)
parentfea3158c5508f3a96b0cfec6d37a239aa7f3ed4b (diff)
Merge branches 'msm/dt', 'imx/dt' and 'at91/dt' into next/dt