summaryrefslogtreecommitdiffstats
path: root/drivers/input/serio
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2010-11-30 14:13:15 -0800
committerTony Lindgren <tony@atomide.com>2010-11-30 14:13:15 -0800
commit9c7bc451e41abf78b0fd856a9f916f7d39e26297 (patch)
treed643495fab1eb013ae3f5e689cf3cec9702b8f62 /drivers/input/serio
parent2862945bf5262d516583477ce420a2f122306f43 (diff)
parent662b083a87a3489f3f19c6e0651c1b99b0de5df0 (diff)
parent1cb125caf2e0fdece14f72efbb3516f5c5fe1de9 (diff)
downloadlinux-9c7bc451e41abf78b0fd856a9f916f7d39e26297.tar.bz2
Merge branches 'devel-cleanup', 'devel-serial' and 'devel-board' into omap-for-linus