summaryrefslogtreecommitdiff
path: root/drivers/mfd/htc-pasic3.c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-04-30 00:31:06 +0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-04-30 00:31:06 +0400
commit92794a5d6359f9e8ed0d43fe0f3c653f748dcc90 (patch)
treeff9e1e49639c657c72d848f891f8f1b44de7a541 /drivers/mfd/htc-pasic3.c
parent681587c58639444215a7c88f7471819997d2f226 (diff)
parent7883938b0d5ee8dd6381e1e2a9f71254252fd504 (diff)
parentb46926bb2d9977799c88aef17a4386ee02c326d8 (diff)
downloadlinux-92794a5d6359f9e8ed0d43fe0f3c653f748dcc90.tar.xz
Merge branches 'pxa' and 'orion-fixes1'