aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-kirkwood/guruplug-setup.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-03-14 22:26:30 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-03-14 22:26:30 +0000
commit5821c95ffbfd368194927a4f7803125c5af8857c (patch)
tree87dccb04c93d3a7c0af704a0db07e496e76a7431 /arch/arm/mach-kirkwood/guruplug-setup.c
parentMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-tcc into devel-stable (diff)
parentdavinci: macro rename DA8XX_LPSC0_DMAX to DA8XX_LPSC0_PRUSS. (diff)
downloadlinux-dev-5821c95ffbfd368194927a4f7803125c5af8857c.tar.xz
linux-dev-5821c95ffbfd368194927a4f7803125c5af8857c.zip
Merge branch 'davinci-next' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci into devel-stable
Diffstat (limited to 'arch/arm/mach-kirkwood/guruplug-setup.c')
0 files changed, 0 insertions, 0 deletions