aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-sa1100/pleb.c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-10-09 21:31:54 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-10-09 21:31:54 +0100
commit90bb28b0644f7324f8bd1feb27b35146e6785ba2 (patch)
tree18885d181ca21fdd66abd8a3db3498ab3d7ea21c /arch/arm/mach-sa1100/pleb.c
parentb4ffb0edf4ed9cef77031dceeaa21d1b66076600 (diff)
parent3bca103a1e658d23737d20e1989139d9ca8973bf (diff)
parent446b097a426f0fa7d37bd2576bdf6d72d6483ac1 (diff)
parent8e6c81fe289e90b188203ec1db1dc2f3e992ebde (diff)
parent0ac4ed9d76400e7c073b9d81cea13f8613d24361 (diff)
parentbda03086093d4535e39ee8a6120e3fbb73e83b1a (diff)
downloadlinux-2.6.34-ux500-90bb28b0644f7324f8bd1feb27b35146e6785ba2.tar.gz
Merge branches 'machtypes', 'core', 'ep93xx', 'ks8695', 'netdev' and 'sa1100' into devel