summaryrefslogtreecommitdiff
path: root/drivers/input/serio/serio.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-12-18 22:14:46 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2011-12-18 22:14:46 (GMT)
commite34d6b4b1ca5b4ec6811544c495fadd86e2cccbd (patch)
treea242c5993090fc995d3695958bcd5284ec484962 /drivers/input/serio/serio.c
parent497f16f21a04060098c0da6ed522fbcafb90c0db (diff)
parent0d5fb5ea7d0e6bc84a523c39a666d7eb1a7e43de (diff)
downloadlinux-fsl-qoriq-e34d6b4b1ca5b4ec6811544c495fadd86e2cccbd.tar.xz
Merge branch 'for-linus/i2c-32-rc6' of git://git.fluff.org/bjdooks/linux
* 'for-linus/i2c-32-rc6' of git://git.fluff.org/bjdooks/linux: i2c-eg20t: correct the driver init order of pch_i2c_probe() I2C: OMAP: fix FIFO usage for OMAP4 i2c-s3c2410: Fix return code of s3c24xx_i2c_parse_dt_gpio i2c: i2c-s3c2410: Add a cpu_relax() to busy wait for bus idle
Diffstat (limited to 'drivers/input/serio/serio.c')
0 files changed, 0 insertions, 0 deletions