Linux 3.0.27
Conflicts:
	.gitignore
	Documentation/00-INDEX
	Documentation/cgroups/cgroups.txt
	Documentation/cgroups/cpuacct.txt
	Documentation/kernel-parameters.txt
	Documentation/power/runtime_pm.txt
	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/pl330.c
	arch/arm/common/vic.c
	arch/arm/include/asm/cacheflush.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/hardware/vic.h
	arch/arm/include/asm/irq.h
	arch/arm/include/asm/kmap_types.h
	arch/arm/include/asm/smp.h
	arch/arm/kernel/armksyms.c
	arch/arm/kernel/entry-armv.S
	arch/arm/kernel/etm.c
	arch/arm/kernel/leds.c
	arch/arm/kernel/process.c
	arch/arm/kernel/ptrace.c
	arch/arm/kernel/smp.c
	arch/arm/kernel/traps.c
	arch/arm/lib/Makefile
	arch/arm/mach-omap2/board-4430sdp.c
	arch/arm/mach-omap2/board-omap4panda.c
	arch/arm/mach-omap2/gpmc.c
	arch/arm/mach-s5pv210/Kconfig
	arch/arm/mach-s5pv210/Makefile
	arch/arm/mach-s5pv210/Makefile.boot
	arch/arm/mach-s5pv210/clock.c
	arch/arm/mach-s5pv210/cpu.c
	arch/arm/mach-s5pv210/cpufreq.c
	arch/arm/mach-s5pv210/dev-audio.c
	arch/arm/mach-s5pv210/dma.c
	arch/arm/mach-s5pv210/include/mach/gpio.h
	arch/arm/mach-s5pv210/include/mach/irqs.h
	arch/arm/mach-s5pv210/include/mach/map.h
	arch/arm/mach-s5pv210/include/mach/memory.h
	arch/arm/mach-s5pv210/include/mach/pm-core.h
	arch/arm/mach-s5pv210/include/mach/regs-clock.h
	arch/arm/mach-s5pv210/include/mach/regs-gpio.h
	arch/arm/mach-s5pv210/include/mach/regs-irq.h
	arch/arm/mach-s5pv210/include/mach/tick.h
	arch/arm/mach-s5pv210/include/mach/vmalloc.h
	arch/arm/mach-s5pv210/init.c
	arch/arm/mach-s5pv210/pm.c
	arch/arm/mach-s5pv210/setup-i2c0.c
	arch/arm/mach-s5pv210/setup-i2c1.c
	arch/arm/mach-s5pv210/setup-i2c2.c
	arch/arm/mach-s5pv210/setup-sdhci-gpio.c
	arch/arm/mach-s5pv210/setup-sdhci.c
	arch/arm/mach-s5pv210/sleep.S
	arch/arm/mm/cache-l2x0.c
	arch/arm/mm/cache-v6.S
	arch/arm/plat-s5p/Kconfig
	arch/arm/plat-s5p/Makefile
	arch/arm/plat-s5p/clock.c
	arch/arm/plat-s5p/dev-csis0.c
	arch/arm/plat-s5p/include/plat/map-s5p.h
	arch/arm/plat-s5p/include/plat/pll.h
	arch/arm/plat-s5p/include/plat/system-reset.h
	arch/arm/plat-s5p/irq-eint.c
	arch/arm/plat-s5p/irq-pm.c
	arch/arm/plat-s5p/irq.c
	arch/arm/plat-samsung/Makefile
	arch/arm/plat-samsung/clock.c
	arch/arm/plat-samsung/dev-hsmmc.c
	arch/arm/plat-samsung/dev-hsmmc1.c
	arch/arm/plat-samsung/dev-hsmmc2.c
	arch/arm/plat-samsung/dev-hsmmc3.c
	arch/arm/plat-samsung/dev-i2c0.c
	arch/arm/plat-samsung/dev-i2c1.c
	arch/arm/plat-samsung/dev-i2c2.c
	arch/arm/plat-samsung/dev-uart.c
	arch/arm/plat-samsung/gpio-config.c
	arch/arm/plat-samsung/include/plat/clock.h
	arch/arm/plat-samsung/include/plat/cpu.h
	arch/arm/plat-samsung/include/plat/devs.h
	arch/arm/plat-samsung/include/plat/dma.h
	arch/arm/plat-samsung/include/plat/gpio-cfg-helpers.h
	arch/arm/plat-samsung/include/plat/gpio-cfg.h
	arch/arm/plat-samsung/include/plat/gpio-core.h
	arch/arm/plat-samsung/include/plat/iic.h
	arch/arm/plat-samsung/include/plat/map-base.h
	arch/arm/plat-samsung/include/plat/pm.h
	arch/arm/plat-samsung/include/plat/regs-rtc.h
	arch/arm/plat-samsung/include/plat/regs-sdhci.h
	arch/arm/plat-samsung/include/plat/regs-serial.h
	arch/arm/plat-samsung/include/plat/s3c-dma-pl330.h
	arch/arm/plat-samsung/include/plat/sdhci.h
	arch/arm/plat-samsung/include/plat/watchdog-reset.h
	arch/arm/plat-samsung/pm-gpio.c
	arch/arm/plat-samsung/pm.c
	arch/arm/plat-samsung/pwm.c
	arch/arm/plat-samsung/s3c-pl330.c
	arch/arm/plat-samsung/time.c
	arch/arm/vfp/entry.S
	arch/arm/vfp/vfphw.S
	arch/arm/vfp/vfpmodule.c
	arch/x86/include/asm/idle.h
	arch/x86/include/asm/kvm_emulate.h
	arch/x86/kernel/apic/io_apic.c
	arch/x86/kernel/entry_32.S
	arch/x86/kernel/process_64.c
	arch/x86/kernel/tls.c
	arch/x86/kernel/tsc.c
	arch/x86/kernel/vm86_32.c
	arch/x86/kvm/emulate.c
	arch/x86/kvm/x86.c
	arch/x86/net/bpf_jit_comp.c
	block/Kconfig.iosched
	block/Makefile
	block/blk-core.c
	block/deadline-iosched.c
	block/genhd.c
	crypto/Kconfig
	crypto/crc32c.c
	drivers/Kconfig
	drivers/Makefile
	drivers/ata/pata_legacy.c
	drivers/base/power/main.c
	drivers/base/power/runtime.c
	drivers/bluetooth/ath3k.c
	drivers/bluetooth/btusb.c
	drivers/char/Kconfig
	drivers/char/Makefile
	drivers/char/mem.c
	drivers/cpufreq/Kconfig
	drivers/cpufreq/Makefile
	drivers/cpufreq/cpufreq.c
	drivers/cpufreq/cpufreq_conservative.c
	drivers/cpufreq/cpufreq_ondemand.c
	drivers/cpufreq/cpufreq_stats.c
	drivers/cpuidle/governors/menu.c
	drivers/firewire/ohci.c
	drivers/gpio/gpio-s5pv210.c
	drivers/gpu/Makefile
	drivers/gpu/drm/i915/i915_drv.c
	drivers/gpu/drm/i915/intel_drv.h
	drivers/gpu/drm/i915/intel_fb.c
	drivers/gpu/drm/i915/intel_hdmi.c
	drivers/gpu/drm/i915/intel_lvds.c
	drivers/gpu/drm/radeon/radeon_atombios.c
	drivers/gpu/drm/radeon/radeon_connectors.c
	drivers/gpu/drm/radeon/radeon_cursor.c
	drivers/gpu/drm/radeon/radeon_object.c
	drivers/gpu/drm/radeon/radeon_object.h
	drivers/hid/hid-chicony.c
	drivers/hid/hid-core.c
	drivers/hid/hid-debug.c
	drivers/hid/hid-ids.h
	drivers/hid/hid-input.c
	drivers/hid/hid-magicmouse.c
	drivers/hid/hid-multitouch.c
	drivers/hwmon/fam15h_power.c
	drivers/i2c/busses/i2c-s3c2410.c
	drivers/infiniband/hw/nes/nes_cm.c
	drivers/infiniband/ulp/iser/iscsi_iser.c
	drivers/infiniband/ulp/iser/iscsi_iser.h
	drivers/infiniband/ulp/iser/iser_initiator.c
	drivers/input/Kconfig
	drivers/input/Makefile
	drivers/input/evdev.c
	drivers/input/input.c
	drivers/input/keyboard/Kconfig
	drivers/input/keyboard/Makefile
	drivers/input/misc/Kconfig
	drivers/input/misc/Makefile
	drivers/input/touchscreen/Kconfig
	drivers/input/touchscreen/Makefile
	drivers/leds/Kconfig
	drivers/leds/Makefile
	drivers/md/bitmap.c
	drivers/md/dm-crypt.c
	drivers/md/dm-exception-store.c
	drivers/md/raid1.c
	drivers/md/raid10.c
	drivers/media/dvb/frontends/lgdt330x.c
	drivers/media/video/Kconfig
	drivers/media/video/Makefile
	drivers/media/video/pvrusb2/pvrusb2-devattr.c
	drivers/mfd/max8998.c
	drivers/misc/Kconfig
	drivers/misc/Makefile
	drivers/mmc/card/Kconfig
	drivers/mmc/card/block.c
	drivers/mmc/core/Kconfig
	drivers/mmc/core/core.c
	drivers/mmc/core/host.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/Kconfig
	drivers/mmc/host/sdhci-s3c.c
	drivers/mmc/host/sdhci.c
	drivers/mmc/host/sdhci.h
	drivers/mtd/nand/Kconfig
	drivers/mtd/nand/nand_base.c
	drivers/mtd/onenand/onenand_base.c
	drivers/mtd/onenand/samsung.c
	drivers/mtd/ubi/scan.c
	drivers/mtd/ubi/wl.c
	drivers/net/Kconfig
	drivers/net/Makefile
	drivers/net/e1000e/e1000.h
	drivers/net/e1000e/netdev.c
	drivers/net/sky2.c
	drivers/net/tun.c
	drivers/net/usb/usbnet.c
	drivers/net/wimax/Kconfig
	drivers/net/wimax/Makefile
	drivers/net/wireless/Kconfig
	drivers/net/wireless/Makefile
	drivers/net/wireless/p54/p54spi.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/rtlwifi/pci.c
	drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
	drivers/pci/pcie/aspm.c
	drivers/power/Kconfig
	drivers/power/Makefile
	drivers/power/max17040_battery.c
	drivers/power/pda_power.c
	drivers/power/power_supply_core.c
	drivers/regulator/Kconfig
	drivers/regulator/Makefile
	drivers/regulator/max8998.c
	drivers/rtc/Kconfig
	drivers/rtc/Makefile
	drivers/rtc/class.c
	drivers/rtc/interface.c
	drivers/rtc/rtc-max8998.c
	drivers/rtc/rtc-s3c.c
	drivers/s390/net/qeth_l3.h
	drivers/scsi/Kconfig
	drivers/staging/Kconfig
	drivers/staging/Makefile
	drivers/staging/zram/xvmalloc.c
	drivers/staging/zram/xvmalloc_int.h
	drivers/target/loopback/tcm_loop.c
	drivers/target/target_core_alua.c
	drivers/target/target_core_cdb.c
	drivers/target/tcm_fc/tfc_cmd.c
	drivers/tty/moxa.c
	drivers/tty/serial/s5pv210.c
	drivers/tty/serial/samsung.c
	drivers/tty/serial/samsung.h
	drivers/tty/serial/serial_core.c
	drivers/tty/serial/sh-sci.c
	drivers/tty/vt/consolemap.c
	drivers/usb/Kconfig
	drivers/usb/Makefile
	drivers/usb/class/cdc-wdm.c
	drivers/usb/core/driver.c
	drivers/usb/core/hcd.c
	drivers/usb/gadget/Kconfig
	drivers/usb/gadget/Makefile
	drivers/usb/gadget/composite.c
	drivers/usb/gadget/epautoconf.c
	drivers/usb/gadget/f_acm.c
	drivers/usb/gadget/f_mass_storage.c
	drivers/usb/gadget/f_rndis.c
	drivers/usb/gadget/fsl_udc_core.c
	drivers/usb/gadget/gadget_chips.h
	drivers/usb/gadget/hid.c
	drivers/usb/gadget/inode.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/Kconfig
	drivers/usb/host/Makefile
	drivers/usb/host/ehci-fsl.c
	drivers/usb/host/ehci-fsl.h
	drivers/usb/host/ehci-q.c
	drivers/usb/host/ehci.h
	drivers/usb/host/fsl-mph-dr-of.c
	drivers/usb/musb/musb_gadget.c
	drivers/usb/otg/Kconfig
	drivers/usb/otg/Makefile
	drivers/usb/serial/cp210x.c
	drivers/usb/serial/ftdi_sio.c
	drivers/usb/serial/ftdi_sio.h
	drivers/usb/serial/ftdi_sio_ids.h
	drivers/usb/serial/generic.c
	drivers/usb/serial/mos7840.c
	drivers/usb/serial/option.c
	drivers/usb/serial/qcserial.c
	drivers/video/Kconfig
	drivers/video/Makefile
	drivers/video/backlight/tosa_lcd.c
	drivers/video/fbmem.c
	drivers/video/omap2/dss/hdmi.c
	drivers/video/udlfb.c
	firmware/Makefile
	fs/Kconfig
	fs/Makefile
	fs/autofs4/autofs_i.h
	fs/autofs4/dev-ioctl.c
	fs/autofs4/inode.c
	fs/autofs4/waitq.c
	fs/block_dev.c
	fs/btrfs/extent-tree.c
	fs/buffer.c
	fs/cifs/connect.c
	fs/dcache.c
	fs/ext4/ext4.h
	fs/ext4/ext4_jbd2.h
	fs/ext4/extents.c
	fs/ext4/ialloc.c
	fs/ext4/inode.c
	fs/ext4/super.c
	fs/ext4/xattr.c
	fs/ext4/xattr_security.c
	fs/fat/dir.c
	fs/fat/fat.h
	fs/fat/inode.c
	fs/fs-writeback.c
	fs/fuse/dev.c
	fs/fuse/inode.c
	fs/hugetlbfs/inode.c
	fs/inode.c
	fs/internal.h
	fs/jbd2/commit.c
	fs/jbd2/transaction.c
	fs/lockd/svc.c
	fs/namespace.c
	fs/nfs/delegation.c
	fs/nfs/delegation.h
	fs/nfs/nfs4_fs.h
	fs/nfs/nfs4proc.c
	fs/nfs/nfs4state.c
	fs/partitions/check.c
	fs/proc/base.c
	fs/proc/namespaces.c
	fs/proc/task_mmu.c
	fs/quota/quota.c
	fs/super.c
	fs/sync.c
	fs/sysfs/inode.c
	fs/ubifs/budget.c
	fs/udf/file.c
	fs/xfs/xfs_iget.c
	fs/xfs/xfs_log_recover.c
	include/asm-generic/pgtable.h
	include/asm-generic/unistd.h
	include/linux/amba/mmci.h
	include/linux/backing-dev.h
	include/linux/cgroup.h
	include/linux/cpu.h
	include/linux/cpufreq.h
	include/linux/crc32.h
	include/linux/cryptohash.h
	include/linux/elevator.h
	include/linux/fb.h
	include/linux/fs.h
	include/linux/hid.h
	include/linux/highmem.h
	include/linux/if_pppox.h
	include/linux/kernel.h
	include/linux/math64.h
	include/linux/max17040_battery.h
	include/linux/mfd/max8998-private.h
	include/linux/mfd/max8998.h
	include/linux/mm.h
	include/linux/mmc/host.h
	include/linux/mmc/mmc.h
	include/linux/mmc/pm.h
	include/linux/mmc/sdhci.h
	include/linux/mmc/sdio_func.h
	include/linux/mmzone.h
	include/linux/msdos_fs.h
	include/linux/mtd/onenand.h
	include/linux/netfilter/xt_socket.h
	include/linux/pda_power.h
	include/linux/plist.h
	include/linux/power_supply.h
	include/linux/rcupdate.h
	include/linux/rtmutex.h
	include/linux/sched.h
	include/linux/serial_core.h
	include/linux/slab.h
	include/linux/sockios.h
	include/linux/tcp.h
	include/linux/usb/composite.h
	include/linux/usb/gadget.h
	include/linux/usb/hcd.h
	include/linux/writeback.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/if_inet6.h
	include/net/tcp.h
	include/trace/events/ext4.h
	include/trace/events/writeback.h
	include/video/omapdss.h
	init/Kconfig
	kernel/cgroup.c
	kernel/cpu.c
	kernel/fork.c
	kernel/futex.c
	kernel/irq/chip.c
	kernel/irq/manage.c
	kernel/irq/pm.c
	kernel/module.c
	kernel/panic.c
	kernel/pm_qos_params.c
	kernel/power/Kconfig
	kernel/power/Makefile
	kernel/power/hibernate.c
	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
	lib/Kconfig.debug
	lib/Makefile
	lib/crc32.c
	lib/crc32defs.h
	lib/gen_crc32table.c
	lib/kobject_uevent.c
	lib/plist.c
	lib/sha1.c
	lib/string.c
	lib/xz/xz_dec_stream.c
	mm/Makefile
	mm/backing-dev.c
	mm/bootmem.c
	mm/filemap.c
	mm/ksm.c
	mm/memcontrol.c
	mm/memory.c
	mm/mempolicy.c
	mm/mincore.c
	mm/page-writeback.c
	mm/page_alloc.c
	mm/pagewalk.c
	mm/readahead.c
	mm/shmem.c
	mm/slub.c
	mm/sparse.c
	mm/swapfile.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/core/dev.c
	net/ipv4/Makefile
	net/ipv4/af_inet.c
	net/ipv4/devinet.c
	net/ipv4/fib_trie.c
	net/ipv4/netfilter/Kconfig
	net/ipv4/netfilter/ipt_REJECT.c
	net/ipv4/route.c
	net/ipv4/tcp.c
	net/ipv4/tcp_input.c
	net/ipv4/tcp_ipv4.c
	net/ipv4/tcp_minisocks.c
	net/ipv4/tcp_output.c
	net/ipv4/tcp_timer.c
	net/ipv4/udp.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/ipv6/tcp_ipv6.c
	net/ipv6/udp.c
	net/l2tp/l2tp_ppp.c
	net/netfilter/Kconfig
	net/netfilter/Makefile
	net/netfilter/xt_socket.c
	net/phonet/af_phonet.c
	net/phonet/socket.c
	net/rds/send.c
	net/rfkill/Kconfig
	net/rfkill/core.c
	net/sunrpc/cache.c
	net/sunrpc/sched.c
	net/wireless/Kconfig
	net/wireless/scan.c
	net/wireless/sme.c
	net/xfrm/xfrm_replay.c
	security/commoncap.c
	sound/soc/Kconfig
	sound/soc/codecs/Kconfig
	sound/soc/codecs/Makefile
	sound/soc/codecs/wm8994.h
	sound/soc/pxa/pxa-ssp.c
	sound/soc/samsung/Kconfig
	sound/soc/samsung/Makefile
	sound/soc/samsung/dma.c
	sound/soc/samsung/dma.h
	sound/soc/samsung/i2s.c