summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-07-09 21:56:05 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-07-09 21:56:05 +0200
commitfdc614e873bc56ed15d8f4e9fa33516cd0915fc2 (patch)
tree9e0a4fd586bbb6913094ebac9af2955914371bdc /include
parent[ARM] pxa: allow clk aliases (diff)
parent[ARM] 5094/1: pcm990: Add framebuffer and backlight support (diff)
parent[ARM] 5082/1: pxa: Definition for the third USB port control register UP3OCR (diff)
downloadlinux-fdc614e873bc56ed15d8f4e9fa33516cd0915fc2.tar.xz
linux-fdc614e873bc56ed15d8f4e9fa33516cd0915fc2.zip
Merge branches 'pxa-misc', 'pxa-pwm' and 'pxa-multi' into pxa