linux-3.0.38
linux-3.0.39
Merge branch 'linux-3.0.x' of https://github.com/AlexanderBlagodatskih/tuna into jb

Conflicts:
	.gitignore
	Documentation/cgroups/cgroups.txt
	Documentation/cgroups/cpuacct.txt
	Documentation/cpu-freq/governors.txt
	Documentation/power/opp.txt
	Documentation/power/runtime_pm.txt
	Documentation/trace/postprocess/trace-vmscan-postprocess.pl
	Makefile
	arch/arm/Kconfig
	arch/arm/boot/compressed/.gitignore
	arch/arm/boot/compressed/Makefile
	arch/arm/boot/compressed/decompress.c
	arch/arm/boot/compressed/head.S
	arch/arm/common/Kconfig
	arch/arm/common/Makefile
	arch/arm/common/gic.c
	arch/arm/configs/omap2plus_defconfig
	arch/arm/include/asm/dma-mapping.h
	arch/arm/include/asm/hardirq.h
	arch/arm/include/asm/hardware/cache-l2x0.h
	arch/arm/include/asm/hardware/coresight.h
	arch/arm/include/asm/irq.h
	arch/arm/include/asm/mach/map.h
	arch/arm/include/asm/pgtable.h
	arch/arm/include/asm/proc-fns.h
	arch/arm/include/asm/smp.h
	arch/arm/kernel/entry-armv.S
	arch/arm/kernel/etm.c
	arch/arm/kernel/irq.c
	arch/arm/kernel/leds.c
	arch/arm/kernel/process.c
	arch/arm/kernel/smp.c
	arch/arm/kernel/smp_twd.c
	arch/arm/mach-omap1/Makefile
	arch/arm/mach-omap1/gpio15xx.c
	arch/arm/mach-omap1/gpio16xx.c
	arch/arm/mach-omap1/gpio7xx.c
	arch/arm/mach-omap1/mailbox.c
	arch/arm/mach-omap1/timer32k.c
	arch/arm/mach-omap2/Kconfig
	arch/arm/mach-omap2/Makefile
	arch/arm/mach-omap2/board-3430sdp.c
	arch/arm/mach-omap2/board-4430sdp.c
	arch/arm/mach-omap2/board-n8x0.c
	arch/arm/mach-omap2/board-omap4panda.c
	arch/arm/mach-omap2/clkt_dpll.c
	arch/arm/mach-omap2/clock.c
	arch/arm/mach-omap2/clock.h
	arch/arm/mach-omap2/clock2420_data.c
	arch/arm/mach-omap2/clock2430_data.c
	arch/arm/mach-omap2/clock34xx.c
	arch/arm/mach-omap2/clock3xxx_data.c
	arch/arm/mach-omap2/clock44xx.h
	arch/arm/mach-omap2/clock44xx_data.c
	arch/arm/mach-omap2/clockdomain.c
	arch/arm/mach-omap2/clockdomain.h
	arch/arm/mach-omap2/clockdomain2xxx_3xxx.c
	arch/arm/mach-omap2/clockdomain44xx.c
	arch/arm/mach-omap2/clockdomains44xx_data.c
	arch/arm/mach-omap2/cm-regbits-44xx.h
	arch/arm/mach-omap2/cm1_44xx.h
	arch/arm/mach-omap2/cm2_44xx.h
	arch/arm/mach-omap2/cm44xx.c
	arch/arm/mach-omap2/cm44xx.h
	arch/arm/mach-omap2/common.c
	arch/arm/mach-omap2/control.c
	arch/arm/mach-omap2/control.h
	arch/arm/mach-omap2/cpuidle34xx.c
	arch/arm/mach-omap2/devices.c
	arch/arm/mach-omap2/display.c
	arch/arm/mach-omap2/dpll3xxx.c
	arch/arm/mach-omap2/dpll44xx.c
	arch/arm/mach-omap2/gpio.c
	arch/arm/mach-omap2/gpmc.c
	arch/arm/mach-omap2/hsmmc.c
	arch/arm/mach-omap2/hsmmc.h
	arch/arm/mach-omap2/id.c
	arch/arm/mach-omap2/include/mach/ctrl_module_core_44xx.h
	arch/arm/mach-omap2/include/mach/ctrl_module_pad_core_44xx.h
	arch/arm/mach-omap2/include/mach/id.h
	arch/arm/mach-omap2/include/mach/omap4-common.h
	arch/arm/mach-omap2/io.c
	arch/arm/mach-omap2/iommu2.c
	arch/arm/mach-omap2/mailbox.c
	arch/arm/mach-omap2/mcbsp.c
	arch/arm/mach-omap2/mux.c
	arch/arm/mach-omap2/mux.h
	arch/arm/mach-omap2/omap-hotplug.c
	arch/arm/mach-omap2/omap-iommu.c
	arch/arm/mach-omap2/omap-smp.c
	arch/arm/mach-omap2/omap4-common.c
	arch/arm/mach-omap2/omap44xx-smc.S
	arch/arm/mach-omap2/omap_hwmod.c
	arch/arm/mach-omap2/omap_hwmod_2420_data.c
	arch/arm/mach-omap2/omap_hwmod_2430_data.c
	arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
	arch/arm/mach-omap2/omap_hwmod_44xx_data.c
	arch/arm/mach-omap2/omap_hwmod_common_data.c
	arch/arm/mach-omap2/omap_l3_noc.c
	arch/arm/mach-omap2/omap_l3_noc.h
	arch/arm/mach-omap2/omap_opp_data.h
	arch/arm/mach-omap2/omap_twl.c
	arch/arm/mach-omap2/opp.c
	arch/arm/mach-omap2/opp3xxx_data.c
	arch/arm/mach-omap2/opp4xxx_data.c
	arch/arm/mach-omap2/pm-debug.c
	arch/arm/mach-omap2/pm.c
	arch/arm/mach-omap2/pm.h
	arch/arm/mach-omap2/pm24xx.c
	arch/arm/mach-omap2/pm34xx.c
	arch/arm/mach-omap2/pm44xx.c
	arch/arm/mach-omap2/powerdomain.c
	arch/arm/mach-omap2/powerdomain.h
	arch/arm/mach-omap2/powerdomain44xx.c
	arch/arm/mach-omap2/powerdomains2xxx_3xxx_data.c
	arch/arm/mach-omap2/powerdomains2xxx_data.c
	arch/arm/mach-omap2/powerdomains3xxx_data.c
	arch/arm/mach-omap2/powerdomains44xx_data.c
	arch/arm/mach-omap2/prm-regbits-34xx.h
	arch/arm/mach-omap2/prm-regbits-44xx.h
	arch/arm/mach-omap2/prm2xxx_3xxx.c
	arch/arm/mach-omap2/prm2xxx_3xxx.h
	arch/arm/mach-omap2/prm44xx.c
	arch/arm/mach-omap2/prm44xx.h
	arch/arm/mach-omap2/prminst44xx.c
	arch/arm/mach-omap2/serial.c
	arch/arm/mach-omap2/smartreflex-class3.c
	arch/arm/mach-omap2/smartreflex.c
	arch/arm/mach-omap2/smartreflex.h
	arch/arm/mach-omap2/sr_device.c
	arch/arm/mach-omap2/timer-gp.c
	arch/arm/mach-omap2/usb-host.c
	arch/arm/mach-omap2/usb-musb.c
	arch/arm/mach-omap2/vc.h
	arch/arm/mach-omap2/vc3xxx_data.c
	arch/arm/mach-omap2/vc44xx_data.c
	arch/arm/mach-omap2/voltage.c
	arch/arm/mach-omap2/voltage.h
	arch/arm/mach-omap2/voltagedomains3xxx_data.c
	arch/arm/mach-omap2/voltagedomains44xx_data.c
	arch/arm/mach-omap2/vp.h
	arch/arm/mach-omap2/vp3xxx_data.c
	arch/arm/mach-omap2/vp44xx_data.c
	arch/arm/mm/cache-l2x0.c
	arch/arm/mm/cache-v6.S
	arch/arm/mm/context.c
	arch/arm/mm/dma-mapping.c
	arch/arm/mm/mmu.c
	arch/arm/plat-omap/Kconfig
	arch/arm/plat-omap/Makefile
	arch/arm/plat-omap/clock.c
	arch/arm/plat-omap/common.c
	arch/arm/plat-omap/counter_32k.c
	arch/arm/plat-omap/devices.c
	arch/arm/plat-omap/dma.c
	arch/arm/plat-omap/dmtimer.c
	arch/arm/plat-omap/i2c.c
	arch/arm/plat-omap/include/plat/clkdev_omap.h
	arch/arm/plat-omap/include/plat/clock.h
	arch/arm/plat-omap/include/plat/common.h
	arch/arm/plat-omap/include/plat/cpu.h
	arch/arm/plat-omap/include/plat/dmtimer.h
	arch/arm/plat-omap/include/plat/dsp.h
	arch/arm/plat-omap/include/plat/gpio.h
	arch/arm/plat-omap/include/plat/gpmc.h
	arch/arm/plat-omap/include/plat/io.h
	arch/arm/plat-omap/include/plat/iommu.h
	arch/arm/plat-omap/include/plat/iommu2.h
	arch/arm/plat-omap/include/plat/irqs-44xx.h
	arch/arm/plat-omap/include/plat/irqs.h
	arch/arm/plat-omap/include/plat/mcbsp.h
	arch/arm/plat-omap/include/plat/mcspi.h
	arch/arm/plat-omap/include/plat/memory.h
	arch/arm/plat-omap/include/plat/mmc.h
	arch/arm/plat-omap/include/plat/omap-pm.h
	arch/arm/plat-omap/include/plat/omap-serial.h
	arch/arm/plat-omap/include/plat/omap44xx.h
	arch/arm/plat-omap/include/plat/omap_device.h
	arch/arm/plat-omap/include/plat/omap_hwmod.h
	arch/arm/plat-omap/include/plat/serial.h
	arch/arm/plat-omap/include/plat/sram.h
	arch/arm/plat-omap/include/plat/uncompress.h
	arch/arm/plat-omap/include/plat/usb.h
	arch/arm/plat-omap/iommu.c
	arch/arm/plat-omap/iovmm.c
	arch/arm/plat-omap/mailbox.c
	arch/arm/plat-omap/mcbsp.c
	arch/arm/plat-omap/omap_device.c
	arch/arm/plat-omap/sram.c
	arch/arm/vfp/entry.S
	arch/arm/vfp/vfphw.S
	arch/arm/vfp/vfpmodule.c
	arch/mips/include/asm/thread_info.h
	arch/mips/kernel/vmlinux.lds.S
	arch/x86/include/asm/idle.h
	arch/x86/kernel/process_64.c
	block/genhd.c
	drivers/Kconfig
	drivers/Makefile
	drivers/base/Kconfig
	drivers/base/Makefile
	drivers/base/memory.c
	drivers/base/power/main.c
	drivers/base/power/opp.c
	drivers/base/power/runtime.c
	drivers/char/Kconfig
	drivers/char/Makefile
	drivers/char/mem.c
	drivers/cpufreq/Kconfig
	drivers/cpufreq/Makefile
	drivers/cpufreq/cpufreq.c
	drivers/cpufreq/cpufreq_stats.c
	drivers/cpufreq/freq_table.c
	drivers/cpuidle/governors/menu.c
	drivers/gpio/gpio-omap.c
	drivers/gpu/Makefile
	drivers/hid/hid-debug.c
	drivers/hid/hid-input.c
	drivers/hid/hid-magicmouse.c
	drivers/hid/hid-multitouch.c
	drivers/i2c/busses/i2c-omap.c
	drivers/i2c/i2c-core.c
	drivers/input/Kconfig
	drivers/input/Makefile
	drivers/input/evdev.c
	drivers/input/misc/Kconfig
	drivers/input/misc/Makefile
	drivers/input/touchscreen/Kconfig
	drivers/input/touchscreen/Makefile
	drivers/input/touchscreen/atmel_mxt_ts.c
	drivers/leds/Kconfig
	drivers/leds/Makefile
	drivers/md/dm-raid1.c
	drivers/md/dm-region-hash.c
	drivers/media/Kconfig
	drivers/media/video/Kconfig
	drivers/media/video/Makefile
	drivers/mfd/Kconfig
	drivers/mfd/Makefile
	drivers/mfd/omap-usb-host.c
	drivers/mfd/twl-core.c
	drivers/mfd/twl6030-irq.c
	drivers/misc/Kconfig
	drivers/misc/Makefile
	drivers/mmc/card/Kconfig
	drivers/mmc/card/block.c
	drivers/mmc/core/Kconfig
	drivers/mmc/core/bus.c
	drivers/mmc/core/core.c
	drivers/mmc/core/host.c
	drivers/mmc/core/mmc.c
	drivers/mmc/core/quirks.c
	drivers/mmc/core/sd.c
	drivers/mmc/core/sdio.c
	drivers/mmc/core/sdio_bus.c
	drivers/mmc/core/sdio_io.c
	drivers/mmc/host/omap_hsmmc.c
	drivers/mmc/host/sdhci.c
	drivers/mtd/devices/m25p80.c
	drivers/mtd/nand/Kconfig
	drivers/mtd/nand/nand_base.c
	drivers/net/Kconfig
	drivers/net/Makefile
	drivers/net/tun.c
	drivers/net/usb/usbnet.c
	drivers/net/wireless/Kconfig
	drivers/net/wireless/Makefile
	drivers/power/max17040_battery.c
	drivers/power/pda_power.c
	drivers/power/power_supply_core.c
	drivers/regulator/twl-regulator.c
	drivers/rtc/Kconfig
	drivers/rtc/Makefile
	drivers/rtc/class.c
	drivers/rtc/rtc-twl.c
	drivers/spi/omap2_mcspi.c
	drivers/staging/Kconfig
	drivers/staging/Makefile
	drivers/tty/serial/omap-serial.c
	drivers/tty/serial/serial_core.c
	drivers/usb/core/driver.c
	drivers/usb/core/hub.c
	drivers/usb/core/quirks.c
	drivers/usb/gadget/Kconfig
	drivers/usb/gadget/Makefile
	drivers/usb/gadget/composite.c
	drivers/usb/gadget/f_acm.c
	drivers/usb/gadget/f_mass_storage.c
	drivers/usb/gadget/f_rndis.c
	drivers/usb/gadget/rndis.c
	drivers/usb/gadget/storage_common.c
	drivers/usb/gadget/u_ether.c
	drivers/usb/gadget/u_ether.h
	drivers/usb/gadget/u_serial.c
	drivers/usb/host/ehci-dbg.c
	drivers/usb/host/ehci-hub.c
	drivers/usb/host/ehci-omap.c
	drivers/usb/host/ehci-q.c
	drivers/usb/host/ehci.h
	drivers/usb/host/ohci-omap3.c
	drivers/usb/musb/musb_core.c
	drivers/usb/musb/musb_core.h
	drivers/usb/musb/musb_gadget.c
	drivers/usb/musb/musb_host.c
	drivers/usb/musb/musb_regs.h
	drivers/usb/musb/omap2430.c
	drivers/usb/otg/Kconfig
	drivers/usb/otg/Makefile
	drivers/usb/otg/twl6030-usb.c
	drivers/video/Kconfig
	drivers/video/Makefile
	drivers/video/fbmon.c
	drivers/video/modedb.c
	drivers/video/omap2/Kconfig
	drivers/video/omap2/Makefile
	drivers/video/omap2/displays/Kconfig
	drivers/video/omap2/displays/Makefile
	drivers/video/omap2/displays/panel-generic-dpi.c
	drivers/video/omap2/displays/panel-taal.c
	drivers/video/omap2/dss/Kconfig
	drivers/video/omap2/dss/Makefile
	drivers/video/omap2/dss/core.c
	drivers/video/omap2/dss/dispc.c
	drivers/video/omap2/dss/dispc.h
	drivers/video/omap2/dss/display.c
	drivers/video/omap2/dss/dpi.c
	drivers/video/omap2/dss/dsi.c
	drivers/video/omap2/dss/dss.c
	drivers/video/omap2/dss/dss.h
	drivers/video/omap2/dss/dss_features.c
	drivers/video/omap2/dss/dss_features.h
	drivers/video/omap2/dss/hdmi.c
	drivers/video/omap2/dss/manager.c
	drivers/video/omap2/dss/overlay.c
	drivers/video/omap2/dss/rfbi.c
	drivers/video/omap2/dss/sdi.c
	drivers/video/omap2/dss/venc.c
	drivers/video/omap2/omapfb/Kconfig
	drivers/video/omap2/omapfb/omapfb-ioctl.c
	drivers/video/omap2/omapfb/omapfb-main.c
	drivers/video/omap2/omapfb/omapfb.h
	drivers/virtio/virtio_ring.c
	drivers/watchdog/omap_wdt.c
	drivers/watchdog/omap_wdt.h
	fs/Kconfig
	fs/Makefile
	fs/btrfs/disk-io.c
	fs/cifs/readdir.c
	fs/fat/dir.c
	fs/fat/fat.h
	fs/fat/inode.c
	fs/fs-writeback.c
	fs/fuse/dev.c
	fs/hugetlbfs/inode.c
	fs/nfs/internal.h
	fs/nfs/write.c
	fs/partitions/check.c
	fs/proc/base.c
	fs/ubifs/sb.c
	include/linux/amba/mmci.h
	include/linux/cgroup.h
	include/linux/cpu.h
	include/linux/cpufreq.h
	include/linux/cpuset.h
	include/linux/fb.h
	include/linux/fs.h
	include/linux/hid.h
	include/linux/i2c-omap.h
	include/linux/i2c.h
	include/linux/i2c/twl.h
	include/linux/if_pppox.h
	include/linux/init_task.h
	include/linux/input.h
	include/linux/kernel.h
	include/linux/max17040_battery.h
	include/linux/memcontrol.h
	include/linux/migrate.h
	include/linux/mm.h
	include/linux/mmc/card.h
	include/linux/mmc/host.h
	include/linux/mmc/mmc.h
	include/linux/mmc/pm.h
	include/linux/mmc/sdio_func.h
	include/linux/mmzone.h
	include/linux/mod_devicetable.h
	include/linux/msdos_fs.h
	include/linux/netfilter/xt_IDLETIMER.h
	include/linux/netfilter/xt_socket.h
	include/linux/netlink.h
	include/linux/nl80211.h
	include/linux/omapfb.h
	include/linux/opp.h
	include/linux/pda_power.h
	include/linux/plist.h
	include/linux/power_supply.h
	include/linux/rtmutex.h
	include/linux/sched.h
	include/linux/serial_core.h
	include/linux/sockios.h
	include/linux/swap.h
	include/linux/usb.h
	include/linux/usb/composite.h
	include/linux/usb/quirks.h
	include/linux/virtio_ids.h
	include/linux/virtio_ring.h
	include/net/addrconf.h
	include/net/bluetooth/bluetooth.h
	include/net/bluetooth/hci.h
	include/net/bluetooth/hci_core.h
	include/net/bluetooth/l2cap.h
	include/net/bluetooth/mgmt.h
	include/net/bluetooth/rfcomm.h
	include/net/bluetooth/sco.h
	include/net/bluetooth/smp.h
	include/net/cfg80211.h
	include/net/if_inet6.h
	include/net/tcp.h
	include/sound/pcm.h
	include/sound/soc-dai.h
	include/sound/soc-dapm.h
	include/sound/soc.h
	include/trace/events/asoc.h
	include/trace/events/vmscan.h
	include/video/omapdss.h
	init/Kconfig
	kernel/Makefile
	kernel/cgroup.c
	kernel/cpu.c
	kernel/cpuset.c
	kernel/fork.c
	kernel/futex.c
	kernel/irq/chip.c
	kernel/irq/pm.c
	kernel/panic.c
	kernel/pm_qos_params.c
	kernel/power/Kconfig
	kernel/power/Makefile
	kernel/power/main.c
	kernel/power/power.h
	kernel/power/process.c
	kernel/power/suspend.c
	kernel/printk.c
	kernel/rtmutex.c
	kernel/sched.c
	kernel/sysctl.c
	kernel/time/Makefile
	kernel/time/ntp.c
	kernel/time/timekeeping.c
	lib/Kconfig.debug
	lib/Makefile
	lib/plist.c
	lib/string.c
	lib/xz/xz_dec_stream.c
	mm/Makefile
	mm/compaction.c
	mm/filemap.c
	mm/hugetlb.c
	mm/memcontrol.c
	mm/memory-failure.c
	mm/memory_hotplug.c
	mm/mempolicy.c
	mm/migrate.c
	mm/page_alloc.c
	mm/shmem.c
	mm/slab.c
	mm/slub.c
	mm/vmscan.c
	mm/vmstat.c
	net/Kconfig
	net/Makefile
	net/bluetooth/Kconfig
	net/bluetooth/Makefile
	net/bluetooth/af_bluetooth.c
	net/bluetooth/bnep/bnep.h
	net/bluetooth/bnep/core.c
	net/bluetooth/cmtp/capi.c
	net/bluetooth/hci_conn.c
	net/bluetooth/hci_core.c
	net/bluetooth/hci_event.c
	net/bluetooth/hci_sock.c
	net/bluetooth/hidp/core.c
	net/bluetooth/l2cap_core.c
	net/bluetooth/l2cap_sock.c
	net/bluetooth/lib.c
	net/bluetooth/mgmt.c
	net/bluetooth/rfcomm/core.c
	net/bluetooth/rfcomm/sock.c
	net/bluetooth/sco.c
	net/bridge/br_device.c
	net/ipv4/Makefile
	net/ipv4/af_inet.c
	net/ipv4/devinet.c
	net/ipv4/netfilter/Kconfig
	net/ipv4/netfilter/ipt_REJECT.c
	net/ipv4/tcp.c
	net/ipv6/addrconf.c
	net/ipv6/af_inet6.c
	net/ipv6/netfilter/Kconfig
	net/ipv6/netfilter/ip6_tables.c
	net/ipv6/netfilter/ip6t_REJECT.c
	net/ipv6/route.c
	net/mac80211/sta_info.c
	net/netfilter/Kconfig
	net/netfilter/Makefile
	net/netfilter/xt_IDLETIMER.c
	net/netfilter/xt_socket.c
	net/rfkill/Kconfig
	net/rfkill/core.c
	net/wireless/Kconfig
	net/wireless/nl80211.c
	net/wireless/reg.c
	net/wireless/scan.c
	net/wireless/sme.c
	net/xfrm/xfrm_policy.c
	security/Kconfig
	security/Makefile
	security/commoncap.c
	sound/core/pcm_lib.c
	sound/core/pcm_native.c
	sound/soc/Makefile
	sound/soc/atmel/atmel-pcm.c
	sound/soc/au1x/dbdma2.c
	sound/soc/blackfin/bf5xx-ac97-pcm.c
	sound/soc/blackfin/bf5xx-i2s-pcm.c
	sound/soc/blackfin/bf5xx-tdm-pcm.c
	sound/soc/codecs/Kconfig
	sound/soc/codecs/Makefile
	sound/soc/codecs/twl6040.c
	sound/soc/codecs/twl6040.h
	sound/soc/davinci/davinci-pcm.c
	sound/soc/ep93xx/ep93xx-pcm.c
	sound/soc/fsl/fsl_dma.c
	sound/soc/fsl/mpc5200_dma.c
	sound/soc/imx/imx-pcm-fiq.c
	sound/soc/imx/imx-ssi.c
	sound/soc/imx/imx-ssi.h
	sound/soc/jz4740/jz4740-pcm.c
	sound/soc/kirkwood/kirkwood-dma.c
	sound/soc/nuc900/nuc900-pcm.c
	sound/soc/omap/Kconfig
	sound/soc/omap/Makefile
	sound/soc/omap/omap-mcbsp.c
	sound/soc/omap/omap-mcpdm.c
	sound/soc/omap/omap-pcm.c
	sound/soc/omap/sdp4430.c
	sound/soc/pxa/pxa2xx-pcm.c
	sound/soc/s6000/s6000-pcm.c
	sound/soc/samsung/dma.c
	sound/soc/sh/dma-sh7760.c
	sound/soc/sh/fsi.c
	sound/soc/sh/siu_pcm.c
	sound/soc/soc-core.c
	sound/soc/soc-dapm.c
	sound/soc/txx9/txx9aclc.c