aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/IR/ir-keytable.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-07 16:44:30 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-07 16:44:30 -0400
commit5672bc8181b189c05ccc29c692491500682a1b49 (patch)
tree3a8048e29f65664d7add769d0da8a26c65845840 /drivers/media/IR/ir-keytable.c
parent27b3d80a7b6adcf069b5e869e4efcc3a79f88a91 (diff)
parent925bb9c649cf8d7200549b395f2ae291833dd494 (diff)
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: of/i2c: Fix module load order issue caused by of_i2c.c i2c: Fix checks which cause legacy suspend to never get called i2c-pca: Fix waitforcompletion() return value i2c: Fix for suspend/resume issue i2c: Remove obsolete cleanup for clientdata
Diffstat (limited to 'drivers/media/IR/ir-keytable.c')
0 files changed, 0 insertions, 0 deletions