From: Jiri Kosina <jkosina@suse.cz>
Date: Mon, 11 Jul 2011 12:15:48 +0000 (+0200)
Subject: Merge branch 'master' into for-next
X-Git-Tag: v3.1-rc1~245^2~10
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b7e9c223be8ce335e30f2cf6ba588e6a4092275c;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branch 'master' into for-next

Sync with Linus' tree to be able to apply pending patches that
are based on newer code already present upstream.
---

b7e9c223be8ce335e30f2cf6ba588e6a4092275c
diff --cc Documentation/feature-removal-schedule.txt
index 6f55333,72e2384..5d24fa2
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -481,25 -481,8 +481,8 @@@ Who:	FUJITA Tomonori <fujita.tomonori@l
  
  ----------------------------
  
- What:   namespace cgroup (ns_cgroup)
- When:   2.6.38
- Why:    The ns_cgroup leads to some problems:
- 	* cgroup creation is out-of-control
- 	* cgroup name can conflict when pids are looping
- 	* it is not possible to have a single process handling
- 	a lot of namespaces without falling in a exponential creation time
- 	* we may want to create a namespace without creating a cgroup
- 
- 	The ns_cgroup is replaced by a compatibility flag 'clone_children',
- 	where a newly created cgroup will copy the parent cgroup values.
- 	The userspace has to manually create a cgroup and add a task to
- 	the 'tasks' file.
- Who:    Daniel Lezcano <daniel.lezcano@free.fr>
- 
- ----------------------------
- 
  What:	iwlwifi disable_hw_scan module parameters
 -When:	2.6.40
 +When:	3.0
  Why:	Hareware scan is the prefer method for iwlwifi devices for
  	scanning operation. Remove software scan support for all the
  	iwlwifi devices.
diff --cc arch/sh/boards/mach-ecovec24/setup.c
index f80478f,513cb1a..b24d69d
--- a/arch/sh/boards/mach-ecovec24/setup.c
+++ b/arch/sh/boards/mach-ecovec24/setup.c
@@@ -232,8 -233,54 +233,54 @@@ static struct platform_device usb1_comm
  	.resource	= usb1_common_resources,
  };
  
+ /*
+  * USBHS
+  */
+ static int usbhs_get_id(struct platform_device *pdev)
+ {
+ 	return gpio_get_value(GPIO_PTB3);
+ }
+ 
+ static struct renesas_usbhs_platform_info usbhs_info = {
+ 	.platform_callback = {
+ 		.get_id		= usbhs_get_id,
+ 	},
+ 	.driver_param = {
+ 		.buswait_bwait		= 4,
+ 		.detection_delay	= 5,
+ 	},
+ };
+ 
+ static struct resource usbhs_resources[] = {
+ 	[0] = {
+ 		.start	= 0xa4d90000,
+ 		.end	= 0xa4d90124 - 1,
+ 		.flags	= IORESOURCE_MEM,
+ 	},
+ 	[1] = {
+ 		.start	= 66,
+ 		.end	= 66,
+ 		.flags	= IORESOURCE_IRQ,
+ 	},
+ };
+ 
+ static struct platform_device usbhs_device = {
+ 	.name	= "renesas_usbhs",
+ 	.id	= 1,
+ 	.dev = {
+ 		.dma_mask		= NULL,         /*  not use dma */
+ 		.coherent_dma_mask	= 0xffffffff,
+ 		.platform_data		= &usbhs_info,
+ 	},
+ 	.num_resources	= ARRAY_SIZE(usbhs_resources),
+ 	.resource	= usbhs_resources,
+ 	.archdata = {
+ 		.hwblk_id = HWBLK_USB1,
+ 	},
+ };
+ 
  /* LCDC */
 -const static struct fb_videomode ecovec_lcd_modes[] = {
 +static const struct fb_videomode ecovec_lcd_modes[] = {
  	{
  		.name		= "Panel",
  		.xres		= 800,