summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2011-11-22 14:21:22 +0400
committerSascha Hauer <s.hauer@pengutronix.de>2011-11-22 14:21:22 +0400
commit13420c6b5bac9b05cf9a0ba9c46b8e1d18d45730 (patch)
tree03413a35c7fb9397497e16de61fda289cc17e623 /arch
parent87514fced7c347a7cdd8a7a346d935a168428ff7 (diff)
parent807dfe7041fb1ff2b076b999800553440e61234d (diff)
parentadf792928d1c57f31b92b7908a5ba383e9f05373 (diff)
downloadlinux-13420c6b5bac9b05cf9a0ba9c46b8e1d18d45730.tar.xz
Merge branches 'fixes/imx3-build', 'fixes/imx_ioremap' and 'fixes/maintainer-update' into imx-fixes