Merge branch 'master' into for-next
authorJiri Kosina <jkosina@suse.cz>
Mon, 11 Jul 2011 12:15:48 +0000 (14:15 +0200)
committerJiri Kosina <jkosina@suse.cz>
Mon, 11 Jul 2011 12:15:55 +0000 (14:15 +0200)
commitb7e9c223be8ce335e30f2cf6ba588e6a4092275c
tree2d1e3b75606abc18df7ad65e51ac3f90cd68b38d
parentc172d82500a6cf3c32d1e650722a1055d72ce858
parente3bbfa78bab125f58b831b5f7f45b5a305091d72
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.
30 files changed:
Documentation/feature-removal-schedule.txt
MAINTAINERS
arch/arm/mach-at91/at91sam9261_devices.c
arch/arm/mach-shmobile/board-ap4evb.c
arch/avr32/mach-at32ap/intc.c
arch/powerpc/sysdev/fsl_rio.c
arch/s390/oprofile/init.c
arch/sh/boards/mach-ecovec24/setup.c
arch/x86/kvm/mmu.c
drivers/media/rc/ite-cir.c
drivers/media/video/m5mols/m5mols_capture.c
drivers/media/video/omap/omap_vout.c
drivers/mmc/host/vub300.c
drivers/net/natsemi.c
drivers/net/pxa168_eth.c
drivers/ssb/driver_pcicore.c
drivers/target/loopback/tcm_loop.c
drivers/target/tcm_fc/tfc_cmd.c
drivers/target/tcm_fc/tfc_io.c
drivers/target/tcm_fc/tfc_sess.c
drivers/tty/serial/8250_pci.c
drivers/usb/gadget/fsl_udc_core.c
drivers/usb/host/ehci-ath79.c
drivers/video/aty/atyfb_base.c
drivers/video/udlfb.c
include/linux/fs.h
kernel/exit.c
kernel/sched.c
sound/atmel/abdac.c
sound/atmel/ac97c.c