Merge branch 'rmobile/mackerel' into rmobile-fixes-for-linus
authorPaul Mundt <lethal@linux-sh.org>
Thu, 19 Jan 2012 02:16:36 +0000 (12:16 +1000)
committerPaul Mundt <lethal@linux-sh.org>
Thu, 19 Jan 2012 02:16:36 +0000 (12:16 +1000)
commit446e326c15c3b45da87b6d883e1c981df035b2ac
tree94d43260cdf9da14cc4d5484ff5f05a388174295
parentd5bb386d70c8e8e79c7f652a794610e01d79f33e
parent6d9b7dd0da1b619ed5f89ff7ab4bc3188c0f7e9f
Merge branch 'rmobile/mackerel' into rmobile-fixes-for-linus
arch/arm/mach-shmobile/board-mackerel.c