aboutsummaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2009-11-02 22:45:56 +0100
committerLars-Peter Clausen <lars@metafoo.de>2009-11-02 22:45:56 +0100
commita8198a15c03ccdd8546f4b626320d08d9803e84b (patch)
tree66f71e24fa5f8fcfeddff11535d63820f6c9282a /drivers/input
parentcf0f0ec16d3b21969f7a468cb1f9a97f94236d01 (diff)
parent3662a9f6331859dd68586dda7afde1aff8ffe6b8 (diff)
parent21f85315656630a662927b9754549b30d7198777 (diff)
Merge branches 'om-gta02-2.6.31' and 'om-gta01-2.6.31' into om-2.6.31
Conflicts: drivers/mfd/Kconfig