summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-22 09:44:47 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-22 09:44:47 -0700
commita28e0852d45e65d9edf249c36e432b5e0a80f01d (patch)
treeb19f4725757252eb070157b06765235138384813 /drivers/input
parente36c886a0f9d624377977fa6cae309cfd7f362fa (diff)
parent1cb0c924fa2d616e5e3b5bc62d97191aac9ff442 (diff)
downloadop-kernel-dev-a28e0852d45e65d9edf249c36e432b5e0a80f01d.zip
op-kernel-dev-a28e0852d45e65d9edf249c36e432b5e0a80f01d.tar.gz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2: nilfs2: wait for discard to finish
Diffstat (limited to 'drivers/input')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud