Changes in Changes

e5451c8f8330e03ad3cfa16048b4daf961af434f - Merge remote-tracking branch 'linusw-gpio/for-next' into devm_gpiochip

Tue, 23 Feb 2016 15:07:08 +0100

Merge remote-tracking branch 'linusw-gpio/for-next' into devm_gpiochipBase for demv_gpiochip_add_data() and devm_gpiochip_remove(). List of files: /linux/fs/affs/Changes

b7d3622a39fde7658170b7f3cf6c6889bb8db30d - Merge tag 'v3.13' into for-3.15

Fri, 07 Mar 2014 17:41:32 +0100

Merge tag 'v3.13' into for-3.15Linux 3.13Conflicts: include/net/xfrm.hSimple merge where v3.13 removed 'extern' from definitions and the audittree did s/u32/unsigned int/ to the same definitions. List of files: /linux/fs/affs/Changes

41be702a542a0d14bb0b1c16e824fa9ed27616ec - Merge tag 'v3.13' into next

Thu, 23 Jan 2014 21:52:06 +0100

Merge tag 'v3.13' into nextLinux 3.13Minor fixup needed in selinux_inet_conn_request()Conflicts: security/selinux/hooks.c List of files: /linux/fs/affs/Changes

825e587af2e90e9b953849f3347a01d8f383d577 - Merge tag 'v3.13' into stable-3.14

Tue, 28 Jan 2014 20:44:16 +0100

Merge tag 'v3.13' into stable-3.14Linux 3.13Conflicts: security/selinux/hooks.cTrivial merge issue in selinux_inet_conn_request() likely due to meincluding patches that I sent to the stable folks in my next treeresulting in the patch hitting twice (I think). Thankfully it was aneasy fix this time, but regardless, lesson learned, I will not do thatagain. List of files: /linux/fs/affs/Changes

6ceb339109adf88a27b6f596c9f99a095f762659 - Merge remote-tracking branch 'wireless-next/master' into ath-next

Tue, 04 Feb 2014 17:29:45 +0100

Merge remote-tracking branch 'wireless-next/master' into ath-next List of files: /linux/fs/affs/Changes

c29b8f3149f2916e98fc3b8d6c1df2137d003979 - Merge tag 'v3.14-rc1' into patchwork

Mon, 03 Feb 2014 18:32:45 +0100

Merge tag 'v3.14-rc1' into patchworkLinus 3.14-rc1* tag 'v3.14-rc1': (11781 commits) Linus 3.14-rc1 hpfs: optimize quad buffer loading hpfs: remember free space parisc: add flexible mmap memory layout support parisc: Make EWOULDBLOCK be equal to EAGAIN on parisc parisc: convert uapi/asm/stat.h to use native types only parisc: wire up sched_setattr and sched_getattr parisc: fix cache-flushing parisc/sti_console: prefer Linux fonts over built-in ROM fonts hwmon: Fix SENSORS_TMP102 dependencies to eliminate build errors hwmon: Fix SENSORS_LM75 dependencies to eliminate build errors tools/power turbostat: introduce -s to dump counters tools/power turbostat: remove unused command line option afs: proc cells and rootcell are writeable tile: remove compat_sys_lookup_dcookie declaration to fix compile error Revert "PCI: Remove from bus_list and release resources in pci_release_dev()" ARM: multi_v7_defconfig: remove redundant entries and re-enable TI_EDMA ARM: multi_v7_defconfig: add mvebu drivers clocksource: kona: Add basic use of external clock drivers: bus: fix CCI driver kcalloc call parameters swap ... List of files: /linux/fs/affs/Changes

62813858fb5d1fb661433d7884668aa111115a35 - Merge branches 'for-3.13/upstream-fixes', 'for-3.14/i2c-hid', 'for-3.14/sensor-hub', 'for-3.14/sony' and 'for-3.14/upstream' into for-linus

Wed, 22 Jan 2014 15:40:14 +0100

Merge branches 'for-3.13/upstream-fixes', 'for-3.14/i2c-hid', 'for-3.14/sensor-hub', 'for-3.14/sony' and 'for-3.14/upstream' into for-linus List of files: /linux/fs/affs/Changes

81e53d0470878165a300d75ac06a5bc5eee543a2 - Merge branches 'topic/sc18is602' and 'topic/rspi' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-bpw

Fri, 17 Jan 2014 16:52:17 +0100

Merge branches 'topic/sc18is602' and 'topic/rspi' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-bpw List of files: /linux/fs/affs/Changes

598911b42c940158caa1169092a804903bde845e - Merge tag 'v3.13-rc4' into regulator-pfuze100

Wed, 15 Jan 2014 12:46:35 +0100

Merge tag 'v3.13-rc4' into regulator-pfuze100Linux 3.13-rc4 List of files: /linux/fs/affs/Changes

64a9aa9cf57dd551a9ae9bf48f5e63be608aae72 - Merge tag 'v3.13-rc3' into asoc-pcm

Tue, 14 Jan 2014 21:41:53 +0100

Merge tag 'v3.13-rc3' into asoc-pcmLinux 3.13-rc3 List of files: /linux/fs/affs/Changes

13ea3300100ec3461560b1e061033cd167333a86 - Merge branch 'topic/rcar' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-rspi

Tue, 14 Jan 2014 15:14:47 +0100

Merge branch 'topic/rcar' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-rspi List of files: /linux/fs/affs/Changes

fce6bd84d663b92997e0fa9c971ed2b2cdf08fb4 - Merge tag 'v3.13-rc3' into asoc-arizona

Fri, 10 Jan 2014 12:52:05 +0100

Merge tag 'v3.13-rc3' into asoc-arizonaLinux 3.13-rc3 List of files: /linux/fs/affs/Changes

54a387cb9e600256e50cb9e2209e7e4f06f464de - Merge branch 'for-3.14/core' into for-3.14/drivers

Wed, 08 Jan 2014 17:32:45 +0100

Merge branch 'for-3.14/core' into for-3.14/driversWe need the updated code to make bcache easier to merge. List of files: /linux/fs/affs/Changes

38fd2c202a3d82bc12430bce5789fa2c2a406f71 - Merge to v3.13-rc7 for prerequisite changes in the Xen code for TPM

Mon, 06 Jan 2014 12:23:01 +0100

Merge to v3.13-rc7 for prerequisite changes in the Xen code for TPM List of files: /linux/fs/affs/Changes

ef0b8b9a521c65201bfca9747ee1bf374296133c - Merge tag 'v3.13-rc7' into x86/efi-kexec to resolve conflicts

Sun, 05 Jan 2014 12:34:29 +0100

Merge tag 'v3.13-rc7' into x86/efi-kexec to resolve conflictsConflicts: arch/x86/platform/efi/efi.c drivers/firmware/efi/KconfigSigned-off-by: Ingo Molnar List of files: /linux/fs/affs/Changes

b28bc9b38c52f63f43e3fd875af982f2240a2859 - Merge tag 'v3.13-rc6' into for-3.14/core

Tue, 31 Dec 2013 17:51:02 +0100

Merge tag 'v3.13-rc6' into for-3.14/coreNeeded to bring blk-mq uptodate, since changes have been going insince for-3.14/core was established.Fixup merge issues related to the immutable biovec changes.Signed-off-by: Jens Axboe Conflicts: block/blk-flush.c fs/btrfs/check-integrity.c fs/btrfs/extent_io.c fs/btrfs/scrub.c fs/logfs/dev_bdev.c List of files: /linux/fs/affs/Changes

68066bb378a0504439e046cdb55d88362eb6379d - Merge tag 'v3.13-rc6' into spi-dw

Tue, 31 Dec 2013 13:59:55 +0100

Merge tag 'v3.13-rc6' into spi-dwTo resolve trivial overlaps with fixes.Linux 3.13-rc6 List of files: /linux/fs/affs/Changes

34f653345018c42cedea89b7f6a4aba3783ebd7b - Merge tag 'v3.13-rc4' into regmap-core

Mon, 30 Dec 2013 13:38:53 +0100

Merge tag 'v3.13-rc4' into regmap-coreNeeded as a subsequent patch is built on some of the fixes.Linux 3.13-rc4 List of files: /linux/fs/affs/Changes

490b929d42d2a321887f9538a83fc9f215675f15 - Merge branch 'efm32/soc' into next/soc

Fri, 20 Dec 2013 17:59:04 +0100

Merge branch 'efm32/soc' into next/socFrom Uwe Kleine-König:* efm32/soc: (1003 commits) ARM: device trees for Energy Micro's EFM32 Cortex-M3 SoCs ARM: new platform for Energy Micro's EFM32 Cortex-M3 SoCs +Linux 3.13-rc4Signed-off-by: Kevin Hilman List of files: /linux/fs/affs/Changes

c139e1425ff7bec7ac22ed90acbadb1b7aa091a9 - Merge tag 'v3.13-rc4' into next

Thu, 19 Dec 2013 16:18:53 +0100

Merge tag 'v3.13-rc4' into nextLinux 3.13-rc4* tag 'v3.13-rc4': (1001 commits) Linux 3.13-rc4 null_blk: mem garbage on NUMA systems during init radeon_pm: fix oops in hwmon_attributes_visible() and radeon_hwmon_show_temp_thresh() Revert "selinux: consider filesystem subtype in policies" igb: Fix for issue where values could be too high for udelay function. i40e: fix null dereference ARM: fix asm/memory.h build error dm array: fix a reference counting bug in shadow_ablock dm space map: disallow decrementing a reference count below zero mm: memcg: do not allow task about to OOM kill to bypass the limit mm: memcg: fix race condition between memcg teardown and swapin thp: move preallocated PTE page table on move_huge_pmd() mfd/rtc: s5m: fix register updating by adding regmap for RTC rtc: s5m: enable IRQ wake during suspend rtc: s5m: limit endless loop waiting for register update rtc: s5m: fix unsuccesful IRQ request during probe drivers/rtc/rtc-s5m.c: fix info->rtc assignment include/linux/kernel.h: make might_fault() a nop for !MMU drivers/rtc/rtc-at91rm9200.c: correct alarm over day/month wrap procfs: also fix proc_reg_get_unmapped_area() for !MMU case ...Signed-off-by: Felipe Balbi List of files: /linux/fs/affs/Changes