rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commit

]> rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commit

projects / sojka / nv-tegra / linux-3.10.git / commit

author	Dan Willemsen <dwillemsen@nvidia.com>
	Sat, 14 Sep 2013 08:36:41 +0000 (01:36 -0700)
committer	Dan Willemsen <dwillemsen@nvidia.com>
	Sat, 14 Sep 2013 08:36:41 +0000 (01:36 -0700)
commit	c70ba0b1799cd1c3a2f027238851149ecdb79da6
tree	693cbeda7444a624731b8b2c0616365ed5ab7335	tree \| snapshot
parent	fa791cecfb6dcf223d81c2e0aac2cd1f93d7c911	commit \| diff
parent	a88f9e27498afaea615ad3e93af4f26df1f84987	commit \| diff

Merge commit 'a88f9e27498afaea615ad3e93af4f26df1f84987' into after-upstream-android

Conflicts:
arch/arm/common/Kconfig
arch/arm/mm/Makefile
arch/arm/mm/cache-l2x0.c
arch/arm/mm/mmu.c
drivers/input/Kconfig
drivers/input/Makefile
drivers/power/Kconfig
kernel/futex.c

53 files changed:

arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/common/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/cacheflush.h	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/hardware/cache-l2x0.h	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/process.c	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/smp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/cache-l2x0.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/fault.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/mmu.c	diff1 \|	diff2 \|	blob \| history
block/genhd.c	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/cpufreq_stats.c	diff1 \|	diff2 \|	blob \| history
drivers/cpuidle/governors/menu.c	diff1 \|	diff2 \|	blob \| history
drivers/input/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/input/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/input/misc/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/input/misc/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/misc/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/misc/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/mmc/card/block.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/core/core.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/core/sd.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/core/sdio.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/core/sdio_io.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/tun.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/power/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/power/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/serial_core.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/f_rndis.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/udc-core.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/phy/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/phy/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/video/Kconfig	diff1 \|	diff2 \|	blob \| history
include/linux/cgroup.h	diff1 \|	diff2 \|	blob \| history
include/linux/cpufreq.h	diff1 \|	diff2 \|	blob \| history
include/linux/mmc/host.h	diff1 \|	diff2 \|	blob \| history
include/net/bluetooth/hci_core.h	diff1 \|	diff2 \|	blob \| history
include/trace/events/power.h	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/if_pppox.h	diff1 \|	diff2 \|	blob \| history
kernel/cgroup.c	diff1 \|	diff2 \|	blob \| history
kernel/cpu.c	diff1 \|	diff2 \|	blob \| history
kernel/fork.c	diff1 \|	diff2 \|	blob \| history
kernel/printk.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/Kconfig	diff1 \|	diff2 \|	blob \| history
kernel/trace/Makefile	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.h	diff1 \|	diff2 \|	blob \| history
lib/Kconfig.debug	diff1 \|	diff2 \|	blob \| history
mm/page_alloc.c	diff1 \|	diff2 \|	blob \| history

RSS Atom

arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/common/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/cacheflush.h	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/hardware/cache-l2x0.h	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/process.c	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/smp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/cache-l2x0.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/fault.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/mmu.c	diff1 \|	diff2 \|	blob \| history
block/genhd.c	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/cpufreq_stats.c	diff1 \|	diff2 \|	blob \| history
drivers/cpuidle/governors/menu.c	diff1 \|	diff2 \|	blob \| history
drivers/input/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/input/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/input/misc/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/input/misc/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/misc/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/misc/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/mmc/card/block.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/core/core.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/core/sd.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/core/sdio.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/core/sdio_io.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/tun.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/power/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/power/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/serial_core.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/f_rndis.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/udc-core.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/phy/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/phy/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/video/Kconfig	diff1 \|	diff2 \|	blob \| history
include/linux/cgroup.h	diff1 \|	diff2 \|	blob \| history
include/linux/cpufreq.h	diff1 \|	diff2 \|	blob \| history
include/linux/mmc/host.h	diff1 \|	diff2 \|	blob \| history
include/net/bluetooth/hci_core.h	diff1 \|	diff2 \|	blob \| history
include/trace/events/power.h	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/if_pppox.h	diff1 \|	diff2 \|	blob \| history
kernel/cgroup.c	diff1 \|	diff2 \|	blob \| history
kernel/cpu.c	diff1 \|	diff2 \|	blob \| history
kernel/fork.c	diff1 \|	diff2 \|	blob \| history
kernel/printk.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/Kconfig	diff1 \|	diff2 \|	blob \| history
kernel/trace/Makefile	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.h	diff1 \|	diff2 \|	blob \| history
lib/Kconfig.debug	diff1 \|	diff2 \|	blob \| history
mm/page_alloc.c	diff1 \|	diff2 \|	blob \| history