diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-08 06:35:17 +0900 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-08 06:35:17 +0900 |
commit | 1b033447bf847ba49c3816c564c9191c97456b36 (patch) | |
tree | 4b4b19649671a230a9071c8422a065766eb86a6f /include/video/uvesafb.h | |
parent | c0703c12ef6744b6d2565ec67a15aaf25d534abd (diff) | |
parent | c415b303a704e5c5f766fc0404093910c36cc4ab (diff) | |
download | linux-1b033447bf847ba49c3816c564c9191c97456b36.tar.gz |
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
Pull i2c updates from Jean Delvare: "Most visible changes are the SMBus multiplexing support added to the i2c-i801 driver, as well as support for the VIA VX900." * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: i2c-piix4: Fix build failure i2c: Correct struct i2c_driver doc about detection i2c-i801: Let i2c-mux-gpio find the GPIO chip i2c-mux-gpio: Update documentation i2c-mux-gpio: Add support for dynamically allocated GPIO pins i2c-mux-gpio: Use devm_kzalloc instead of kzalloc i2c-i801: Support SMBus multiplexing on Asus Z8 series i2c-viapro: Add VIA VX900 device ID i2c-parport: i2c_parport_irq can be static i2c-designware: i2c_dw_xfer_msg can be static i2c/scx200_*: Replace printks with pr_<level>s i2c: Make I2C available on UML i2c: Convert struct i2c_msg initialization to C99 format i2c-smbus: Convert kzalloc to devm_kzalloc i2c-mux: Add support for device auto-detection
Diffstat (limited to 'include/video/uvesafb.h')
0 files changed, 0 insertions, 0 deletions