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.

diff --cc Documentation/feature-removal-schedule.txt
index 6f55333,72e2384..5d24fa2
--- 1/Documentation/feature-removal-schedule.txt
--- 2/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 MAINTAINERS
Simple merge

diff --cc arch/arm/mach-at91/at91sam9261_devices.c
Simple merge

diff --cc arch/arm/mach-shmobile/board-ap4evb.c
Simple merge

diff --cc arch/avr32/mach-at32ap/intc.c
Simple merge

diff --cc arch/powerpc/sysdev/fsl_rio.c
Simple merge

diff --cc arch/s390/oprofile/init.c
Simple merge

diff --cc arch/sh/boards/mach-ecovec24/setup.c
index f80478f,513cb1a..b24d69d
--- 1/arch/sh/boards/mach-ecovec24/setup.c
--- 2/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,

diff --cc arch/x86/kvm/mmu.c
Simple merge

diff --cc drivers/media/rc/ite-cir.c
Simple merge

diff --cc drivers/media/video/m5mols/m5mols_capture.c
Simple merge

diff --cc drivers/media/video/omap/omap_vout.c
Simple merge

diff --cc drivers/mmc/host/vub300.c
Simple merge

diff --cc drivers/net/natsemi.c
Simple merge

diff --cc drivers/net/pxa168_eth.c
Simple merge

diff --cc drivers/ssb/driver_pcicore.c
Simple merge

diff --cc drivers/target/loopback/tcm_loop.c
Simple merge

diff --cc drivers/target/tcm_fc/tfc_cmd.c
Simple merge

diff --cc drivers/target/tcm_fc/tfc_io.c
Simple merge

diff --cc drivers/target/tcm_fc/tfc_sess.c
Simple merge

diff --cc drivers/tty/serial/8250_pci.c
Simple merge

diff --cc drivers/usb/gadget/fsl_udc_core.c
Simple merge

diff --cc drivers/usb/host/ehci-ath79.c
Simple merge

diff --cc drivers/video/aty/atyfb_base.c
Simple merge

diff --cc drivers/video/udlfb.c
Simple merge

diff --cc include/linux/fs.h
Simple merge

diff --cc kernel/exit.c
Simple merge

diff --cc kernel/sched.c
Simple merge

diff --cc sound/atmel/abdac.c
Simple merge

diff --cc sound/atmel/ac97c.c
Simple merge