aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/edac
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-07-09 20:56:05 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-07-09 20:56:05 +0100
commitfdc614e873bc56ed15d8f4e9fa33516cd0915fc2 (patch)
tree9e0a4fd586bbb6913094ebac9af2955914371bdc /drivers/edac
parentbdb08cb2d3491d441dd403dfb88d90ba90fb7232 (diff)
parentc0f7edb3099d538017c52556aab596b857dc92ee (diff)
parent9fc697b0b01416edae99dd9c5c49fb69c9282744 (diff)
downloadkernel_samsung_smdk4412-fdc614e873bc56ed15d8f4e9fa33516cd0915fc2.zip
kernel_samsung_smdk4412-fdc614e873bc56ed15d8f4e9fa33516cd0915fc2.tar.gz
kernel_samsung_smdk4412-fdc614e873bc56ed15d8f4e9fa33516cd0915fc2.tar.bz2
Merge branches 'pxa-misc', 'pxa-pwm' and 'pxa-multi' into pxa