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	Ishan Mittal <imittal@nvidia.com>
	Wed, 11 Feb 2015 06:18:25 +0000 (11:48 +0530)
committer	Ishan Mittal <imittal@nvidia.com>
	Wed, 11 Feb 2015 06:18:25 +0000 (11:48 +0530)
commit	ca820c9dc335027143dca1f0610dafafee752e21
tree	83153bfb1a86380a1e4ae4cb6e84f2bc932d12cb	tree \| snapshot
parent	65f1a39fb92c64ada292db949fc4fabf411c73c9	commit \| diff
parent	4227cffc1f9e4a9241071354476c225705b614c8	commit \| diff

Merge linux-3.10.67 into dev-kernel-3.10

Conflicts:
fs/pstore/ram_core.c
kernel/time/sched_clock.c
sound/soc/codecs/max98090.c

Bug 200063550

Change-Id: I345f603c8d1232339e5bb43efe755f416f837945
Signed-off-by: Ishan Mittal <imittal@nvidia.com>

42 files changed:

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/timer.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/proc-v7.S	diff1 \|	diff2 \|	blob \| history
block/genhd.c	diff1 \|	diff2 \|	blob \| history
drivers/gpio/gpiolib-of.c	diff1 \|	diff2 \|	blob \| history
drivers/gpio/gpiolib.c	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-core.c	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-ids.h	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-input.c	diff1 \|	diff2 \|	blob \| history
drivers/hid/i2c-hid/i2c-hid.c	diff1 \|	diff2 \|	blob \| history
drivers/input/joystick/xpad.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/card/block.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/sdhci.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/igb/igb_main.c	diff1 \|	diff2 \|	blob \| history
drivers/of/address.c	diff1 \|	diff2 \|	blob \| history
drivers/pci/msi.c	diff1 \|	diff2 \|	blob \| history
drivers/pci/probe.c	diff1 \|	diff2 \|	blob \| history
drivers/pinctrl/core.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/megaraid/megaraid_sas_base.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/class/cdc-acm.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/xhci-ring.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/ext4.h	diff1 \|	diff2 \|	blob \| history
fs/ext4/extents.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/mballoc.c	diff1 \|	diff2 \|	blob \| history
fs/fs-writeback.c	diff1 \|	diff2 \|	blob \| history
fs/nfs/nfs4proc.c	diff1 \|	diff2 \|	blob \| history
fs/proc/base.c	diff1 \|	diff2 \|	blob \| history
fs/pstore/ram.c	diff1 \|	diff2 \|	blob \| history
fs/pstore/ram_core.c	diff1 \|	diff2 \|	blob \| history
include/linux/mm.h	diff1 \|	diff2 \|	blob \| history
include/linux/pci.h	diff1 \|	diff2 \|	blob \| history
include/linux/pstore_ram.h	diff1 \|	diff2 \|	blob \| history
kernel/pid.c	diff1 \|	diff2 \|	blob \| history
mm/memory.c	diff1 \|	diff2 \|	blob \| history
mm/mmap.c	diff1 \|	diff2 \|	blob \| history
mm/vmscan.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_output.c	diff1 \|	diff2 \|	blob \| history
net/netlink/af_netlink.c	diff1 \|	diff2 \|	blob \| history
scripts/recordmcount.pl	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/hda_codec.c	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/max98090.c	diff1 \|	diff2 \|	blob \| history

RSS Atom

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/timer.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/proc-v7.S	diff1 \|	diff2 \|	blob \| history
block/genhd.c	diff1 \|	diff2 \|	blob \| history
drivers/gpio/gpiolib-of.c	diff1 \|	diff2 \|	blob \| history
drivers/gpio/gpiolib.c	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-core.c	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-ids.h	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-input.c	diff1 \|	diff2 \|	blob \| history
drivers/hid/i2c-hid/i2c-hid.c	diff1 \|	diff2 \|	blob \| history
drivers/input/joystick/xpad.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/card/block.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/sdhci.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/igb/igb_main.c	diff1 \|	diff2 \|	blob \| history
drivers/of/address.c	diff1 \|	diff2 \|	blob \| history
drivers/pci/msi.c	diff1 \|	diff2 \|	blob \| history
drivers/pci/probe.c	diff1 \|	diff2 \|	blob \| history
drivers/pinctrl/core.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/megaraid/megaraid_sas_base.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/class/cdc-acm.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/xhci-ring.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/ext4.h	diff1 \|	diff2 \|	blob \| history
fs/ext4/extents.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/mballoc.c	diff1 \|	diff2 \|	blob \| history
fs/fs-writeback.c	diff1 \|	diff2 \|	blob \| history
fs/nfs/nfs4proc.c	diff1 \|	diff2 \|	blob \| history
fs/proc/base.c	diff1 \|	diff2 \|	blob \| history
fs/pstore/ram.c	diff1 \|	diff2 \|	blob \| history
fs/pstore/ram_core.c	diff1 \|	diff2 \|	blob \| history
include/linux/mm.h	diff1 \|	diff2 \|	blob \| history
include/linux/pci.h	diff1 \|	diff2 \|	blob \| history
include/linux/pstore_ram.h	diff1 \|	diff2 \|	blob \| history
kernel/pid.c	diff1 \|	diff2 \|	blob \| history
mm/memory.c	diff1 \|	diff2 \|	blob \| history
mm/mmap.c	diff1 \|	diff2 \|	blob \| history
mm/vmscan.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_output.c	diff1 \|	diff2 \|	blob \| history
net/netlink/af_netlink.c	diff1 \|	diff2 \|	blob \| history
scripts/recordmcount.pl	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/hda_codec.c	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/max98090.c	diff1 \|	diff2 \|	blob \| history