Merge tag 'v3.7-rc3' into HEAD

Linux 3.7-rc3
2012-11-06 10:11:46 +01:00
parent bac91462e8 8f0d8163b5
commit 90b4d60c61
449 changed files with 5623 additions and 3873 deletions
--- a/arch/arm/mach-at91/at91sam9260_devices.c
+++ b/arch/arm/mach-at91/at91sam9260_devices.c
@@ -389,7 +389,7 @@ static struct i2c_gpio_platform_data pdata = {

 static struct platform_device at91sam9260_twi_device = {
 	.name			= "i2c-gpio",
-	.id			= -1,
+	.id			= 0,
 	.dev.platform_data	= &pdata,
 };

@@ -421,7 +421,7 @@ static struct resource twi_resources[] = {
 };

 static struct platform_device at91sam9260_twi_device = {
-	.id		= -1,
+	.id		= 0,
 	.resource	= twi_resources,
 	.num_resources	= ARRAY_SIZE(twi_resources),
 };