Olof Johansson 0f9cb211ba Linux 3.7-rc7 ... -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) iQEcBAABAgAGBQJQss0FAAoJEHm+PkMAQRiG6cEH/An3PYsWBBy27tzoLyVfJKF1 3m3vR8HS2tnHg6erxms+738jos59vrWXV0Ygnvw0DHbGR0HNb4rkwce/KXu/jgOD MRYNYhlhMFJTEUFrSrcwKITrAV3kVPWXxPXgAR6Gzpr6NPKKM9TBzEv0ze56TFYz asOxqeBcPSS7aFZlkoNsy1wG4l0Quo5ke8VZIxo9Me5qlqubAoZ6pING4wAGXqeE tf81CevSdpe0nqr8/dlYyCvLjrurgpJQczxRCBI3mP6kLWGfUCVzZmcu86PfT9b+ 35zNJwDneIoN+D9bVDHy6mrq9uQdmhWnQuhv1joTPn6RDn1nyBRBd+A5qLxSov4= =CPoy -----END PGP SIGNATURE----- Merge tag 'v3.7-rc7' into next/cleanup Merging in mainline back to next/cleanup since it has collected a few conflicts between fixes going upstream and some of the cleanup patches. Git doesn't auto-resolve some of them, and they're mostly noise so let's take care of it locally. Conflicts are in: arch/arm/mach-omap2/omap_hwmod_44xx_data.c arch/arm/plat-omap/i2c.c drivers/video/omap2/dss/dss.c Signed-off-by: Olof Johansson <olof@lixom.net>		2012-11-25 21:34:34 -08:00
..
algos	Linux 3.6-rc7	2012-10-08 12:46:32 +02:00
busses	Linux 3.7-rc7	2012-11-25 21:34:34 -08:00
muxes	i2c-mux-pinctrl: Fix probe error path	2012-11-13 22:27:19 +01:00
i2c-boardinfo.c	i2c: Update the FSF address	2012-03-26 21:47:19 +02:00
i2c-core.c	i2c: Convert struct i2c_msg initialization to C99 format	2012-10-05 22:23:52 +02:00
i2c-core.h	i2c: Update the FSF address	2012-03-26 21:47:19 +02:00
i2c-dev.c	i2c-dev: Add support for I2C_M_RECV_LEN	2012-05-30 10:55:34 +02:00
i2c-mux.c	i2c-mux: Add support for device auto-detection	2012-10-05 22:23:51 +02:00
i2c-smbus.c	i2c-smbus: Convert kzalloc to devm_kzalloc	2012-10-05 22:23:52 +02:00
i2c-stub.c	i2c-stub: Move to drivers/i2c	2012-10-28 21:37:00 +01:00
Kconfig	i2c: Make I2C available on UML	2012-10-05 22:23:52 +02:00
Makefile	i2c-stub: Move to drivers/i2c	2012-10-28 21:37:00 +01:00