summaryrefslogtreecommitdiff
path: root/arch/arm/mach-pxa/colibri.c
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2008-07-15 19:19:14 (GMT)
committerBen Dooks <ben-linux@fluff.org>2008-07-15 19:19:14 (GMT)
commit0c17e4ceedd35c78b1c7413dbd16279a350be6bc (patch)
tree313b3b9ca04727f3704464e01d8dd97da1dd534b /arch/arm/mach-pxa/colibri.c
parent19c1d6a34abf73d0baf8e325d018c920fa78dddc (diff)
parentb9d2252c1e44fa83a4e65fdc9eb93db6297c55af (diff)
downloadlinux-fsl-qoriq-0c17e4ceedd35c78b1c7413dbd16279a350be6bc.tar.xz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-rmk
Diffstat (limited to 'arch/arm/mach-pxa/colibri.c')
0 files changed, 0 insertions, 0 deletions