Merge tag 'v3.6-rc7' into i2c-embedded/for-next
authorWolfram Sang <w.sang@pengutronix.de>
Mon, 8 Oct 2012 10:46:32 +0000 (12:46 +0200)
committerWolfram Sang <w.sang@pengutronix.de>
Mon, 8 Oct 2012 10:46:32 +0000 (12:46 +0200)
Linux 3.6-rc7

Needed to get updates from i2c-embedded/for-current into i2c-embedded/for-next

1  2 
arch/arm/boot/dts/at91sam9260.dtsi
arch/arm/boot/dts/at91sam9263.dtsi
arch/arm/boot/dts/at91sam9g45.dtsi
arch/arm/boot/dts/at91sam9n12.dtsi
arch/arm/boot/dts/at91sam9x5.dtsi
drivers/i2c/algos/i2c-algo-pca.c
drivers/i2c/busses/Kconfig
drivers/i2c/busses/Makefile

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge