aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/magician.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-07-21 16:34:00 +0200
committerArnd Bergmann <arnd@arndb.de>2011-07-21 16:34:00 +0200
commit1e09939bad24df95ddeeeca4fbec64fa94b66def (patch)
tree8a4661ed8c4619db28863353858e0171171b7d8a /arch/arm/mach-pxa/magician.c
parentMerge branches 'cns3xxx/devel', 'davinci/devel', 'imx/devel', 'lpc32xx/devel', 'pxa/devel', 'tegra/devel' and 'stericsson/master' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc into next/devel (diff)
parentARM: S5P64X0: External Interrupt Support (diff)
downloadlinux-dev-1e09939bad24df95ddeeeca4fbec64fa94b66def.tar.xz
linux-dev-1e09939bad24df95ddeeeca4fbec64fa94b66def.zip
Merge branch 'next-samsung-devel' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/devel
Diffstat (limited to 'arch/arm/mach-pxa/magician.c')
0 files changed, 0 insertions, 0 deletions