Changes in readme

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/drivers/staging/sm750fb/readme

01b944fe1cd4e21a2a9ed51adbdbafe2d5e905ba - Merge branch 'next' into for-linus

Thu, 03 Sep 2015 19:01:44 +0200

Merge branch 'next' into for-linusPrepare first round of input updates for 4.3 merge window. List of files: /linux/drivers/staging/sm750fb/readme

067e2601d3c076abbf45db91261f9065eaa879b2 - Merge branch 'for-4.3/gembird' into for-linus

Tue, 01 Sep 2015 15:35:24 +0200

Merge branch 'for-4.3/gembird' into for-linus List of files: /linux/drivers/staging/sm750fb/readme

8d58b66ed2b000f27658c88a4ed70e8042e86a58 - Merge tag 'v4.2-rc8' into x86/mm, before applying new changes

Tue, 25 Aug 2015 09:59:19 +0200

Merge tag 'v4.2-rc8' into x86/mm, before applying new changesSigned-off-by: Ingo Molnar List of files: /linux/drivers/staging/sm750fb/readme

473e0bc39bd5d2542e90edc622a65bd49206409d - Merge tag 'mac80211-next-for-davem-2015-08-14' into next

Sun, 16 Aug 2015 09:20:58 +0200

Merge tag 'mac80211-next-for-davem-2015-08-14' into nextAnother pull request for the next cycle, this time with quitea bit of content: * mesh fixes/improvements from Alexis, Bob, Chun-Yeow and Jesse * TDLS higher bandwidth support (Arik) * OCB fixes from Bertold Van den Bergh * suspend/resume fixes from Eliad * dynamic SMPS support for minstrel-HT (Krishna Chaitanya) * VHT bitrate mask support (Lorenzo Bianconi) * better regulatory support for 5/10 MHz channels (Matthias May) * basic support for MU-MIMO to avoid the multi-vif issue (Sara Sharon)along with a number of other cleanups. List of files: /linux/drivers/staging/sm750fb/readme

527c465a3c8716d93201ae34b7fc52679610596d - Merge branch 'for-linus' into for-next

Mon, 27 Jul 2015 14:43:29 +0200

Merge branch 'for-linus' into for-next... to make easier developing HDA ext code. List of files: /linux/drivers/staging/sm750fb/readme

43cbf02e7ad51007af38f39c5b2abdc7a5d7f5aa - Merge tag 'asoc-fix-v4.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

Fri, 24 Jul 2015 20:08:13 +0200

Merge tag 'asoc-fix-v4.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linusASoC: Fixes for v4.2A lot of small fixes here, a few to the core: - Fix for binding DAPM stream widgets on devices with prefixes assigned to them - Minor fixes for the newly added topology interfaces - Locking and memory leak fixes for DAPM - Driver specific fixes List of files: /linux/drivers/staging/sm750fb/readme

c57d5621d2f2dc238f4b9c4d00b2a54187a75445 - Merge tag 'v4.2-rc3' into next

Mon, 20 Jul 2015 19:08:17 +0200

Merge tag 'v4.2-rc3' into nextSync up with Linux 4.2-rc3 to bring in infrastructure (OF) pieces. List of files: /linux/drivers/staging/sm750fb/readme

ca6e4405779ed56ebac941570615abd667c72c02 - Merge tag 'drm-intel-fixes-2015-07-15' into drm-intel-next-queued

Wed, 15 Jul 2015 16:36:50 +0200

Merge tag 'drm-intel-fixes-2015-07-15' into drm-intel-next-queuedBackmerge fixes since it's getting out of hand again with the massivesplit due to atomic between -next and 4.2-rc. All the bugfixes in4.2-rc are addressed already (by converting more towards atomicinstead of minimal duct-tape) so just always pick the version in nextfor the conflicts in modeset code.All the other conflicts are just adjacent lines changed.Conflicts: drivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/i915_gem_gtt.c drivers/gpu/drm/i915/intel_display.c drivers/gpu/drm/i915/intel_drv.h drivers/gpu/drm/i915/intel_ringbuffer.hSigned-off-by: Daniel Vetter List of files: /linux/drivers/staging/sm750fb/readme

06be5eefe1192eb8ce8d07497f67595b6bfe9741 - Merge branches 'fixes' and 'ioremap' into for-linus

Tue, 07 Jul 2015 13:35:33 +0200

Merge branches 'fixes' and 'ioremap' into for-linus List of files: /linux/drivers/staging/sm750fb/readme

83dcf400be7165af938dbd6b8ce6805c754701db - Merge 4.2-rc1 into MTD -next

Mon, 06 Jul 2015 22:54:28 +0200

Merge 4.2-rc1 into MTD -next List of files: /linux/drivers/staging/sm750fb/readme

ae745302c0a3e2b5b768690f631fc14db44467e7 - Merge branch 'fixes-rc1' into omap-for-v4.2/fixes

Mon, 06 Jul 2015 14:33:17 +0200

Merge branch 'fixes-rc1' into omap-for-v4.2/fixes List of files: /linux/drivers/staging/sm750fb/readme

98006636b0307387b8b572700bbc9eb093ce6f70 - Merge tag 'v4.2-rc1' into patchwork

Mon, 06 Jul 2015 13:21:35 +0200

Merge tag 'v4.2-rc1' into patchworkLinux 4.2-rc1* tag 'v4.2-rc1': (12415 commits) Linux 4.2-rc1 bluetooth: fix list handling 9p: cope with bogus responses from server in p9_client_{read,write} p9_client_write(): avoid double p9_free_req() 9p: forgetting to cancel request on interrupted zero-copy RPC dax: bdev_direct_access() may sleep block: Add support for DAX reads/writes to block devices dax: Use copy_from_iter_nocache dax: Add block size note to documentation NTB: Add split BAR output for debugfs stats NTB: Change WARN_ON_ONCE to pr_warn_once on unsafe NTB: Print driver name and version in module init NTB: Increase transport MTU to 64k from 16k NTB: Rename Intel code names to platform names NTB: Default to CPU memcpy for performance NTB: Improve performance with write combining NTB: Use NUMA memory in Intel driver NTB: Use NUMA memory and DMA chan in transport NTB: Rate limit ntb_qp_link_work NTB: Add tool test client ... List of files: /linux/drivers/staging/sm750fb/readme

23908db413eccd77084b09c9b0a4451dfb0524c0 - Merge tag 'staging-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

Sat, 27 Jun 2015 00:46:08 +0200

Merge tag 'staging-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/stagingPull staging driver updates from Greg KH: "Here's the big, really big, staging tree patches for 4.2-rc1. Loads of stuff in here, almost all just coding style fixes / churn, and a few new drivers as well, one of which I just disabled from the build a few minutes ago due to way too many build warnings. Other than the one "disable this driver" patch, all of these have been in linux-next for quite a while with no reported issues"* tag 'staging-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1163 commits) staging: wilc1000: disable driver due to build warnings Staging: rts5208: fix CHANGE_LINK_STATE value Staging: sm750fb: ddk750_swi2c.c: Insert spaces before parenthesis Staging: sm750fb: ddk750_swi2c.c: Place braces on correct lines Staging: sm750fb: ddk750_swi2c.c: Insert spaces around operators Staging: sm750fb: ddk750_swi2c.c: Replace spaces with tabs Staging: sm750fb: ddk750_swi2c.h: Shorten lines to under 80 characters Staging: sm750fb: ddk750_swi2c.h: Replace spaces with tabs Staging: sm750fb: modedb.h: Shorten lines to under 80 characters Staging: sm750fb: modedb.h: Replace spaces with tabs staging: comedi: addi_apci_3120: rename 'this_board' variables staging: comedi: addi_apci_1516: rename 'this_board' variables staging: comedi: ni_atmio: cleanup ni_getboardtype() staging: comedi: vmk80xx: sanity check context used to get the boardinfo staging: comedi: vmk80xx: rename 'boardinfo' variables staging: comedi: dt3000: rename 'this_board' variables staging: comedi: adv_pci_dio: rename 'this_board' variables staging: comedi: cb_pcidas64: rename 'thisboard' variables staging: comedi: cb_pcidas: rename 'thisboard' variables staging: comedi: me4000: rename 'thisboard' variables ... List of files: /linux/drivers/staging/sm750fb/readme

6724af486903df57338c14424e02599e371cf563 - Merge branch 'fix/fsl-dspi' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-fsl-dspi

Tue, 09 Jun 2015 19:35:46 +0200

Merge branch 'fix/fsl-dspi' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-fsl-dspi List of files: /linux/drivers/staging/sm750fb/readme

7ae383be81781c5e1347f71c3eb0d53ce5188200 - Merge branch 'linus' into x86/asm, before applying dependent patch

Fri, 08 May 2015 13:33:33 +0200

Merge branch 'linus' into x86/asm, before applying dependent patchSigned-off-by: Ingo Molnar List of files: /linux/drivers/staging/sm750fb/readme

69e98df78271a71b688706dccf2ad4544d63a274 - Staging: fixed multiple spelling errors.

Fri, 24 Apr 2015 15:40:42 +0200

Staging: fixed multiple spelling errors.Fixed multiple spelling errors.Signed-off-by: Carlos E. Garcia Signed-off-by: Greg Kroah-Hartman List of files: /linux/drivers/staging/sm750fb/readme

b3e5ced63e051e8f911b795ac5b06229a5328f7b - Merge tag 'v4.1-rc1' into patchwork

Mon, 27 Apr 2015 15:32:45 +0200

Merge tag 'v4.1-rc1' into patchworkLinux 4.1-rc1* tag 'v4.1-rc1': (11651 commits) Linux 4.1-rc1 x86_64, asm: Work around AMD SYSRET SS descriptor attribute issue v4l: xilinx: fix for include file movement platform/chrome: chromeos_laptop - instantiate Atmel at primary address RCU pathwalk breakage when running into a symlink overmounting something fix I_DIO_WAKEUP definition direct-io: only inc/dec inode->i_dio_count for file systems fs/9p: fix readdir() Btrfs: prevent list corruption during free space cache processing toshiba_acpi: Do not register vendor backlight when acpi_video bl is available x86: fix special __probe_kernel_write() tail zeroing case crypto: img-hash - CRYPTO_DEV_IMGTEC_HASH should depend on HAS_DMA crypto: x86/sha512_ssse3 - fixup for asm function prototype change nios2: rework cache nios2: Add types.h header required for __u32 type ALSA: hda - fix headset mic detection problem for one more machine eth: bf609 eth clock: add pclk clock for stmmac driver probe blackfin: Wire up missing syscalls Btrfs: fix inode cache writeout ACPI / scan: Add a scan handler for PRP0001 ... List of files: /linux/drivers/staging/sm750fb/readme

64131a87f2aae2ed9e05d8227c5b009ca6c50d98 - Merge branch 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux into v4l_for_linus

Tue, 21 Apr 2015 11:33:03 +0200

Merge branch 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux into v4l_for_linus* 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux: (9717 commits) media-bus: Fixup RGB444_1X12, RGB565_1X16, and YUV8_1X24 media bus format hexdump: avoid warning in test function fs: take i_mutex during prepare_binprm for set[ug]id executables smp: Fix error case handling in smp_call_function_*() iommu-common: Fix PARISC compile-time warnings sparc: Make LDC use common iommu poll management functions sparc: Make sparc64 use scalable lib/iommu-common.c functions Break up monolithic iommu table/lock into finer graularity pools and lock sparc: Revert generic IOMMU allocator. tools/power turbostat: correct dumped pkg-cstate-limit value tools/power turbostat: calculate TSC frequency from CPUID(0x15) on SKL tools/power turbostat: correct DRAM RAPL units on recent Xeon processors tools/power turbostat: Initial Skylake support tools/power turbostat: Use $(CURDIR) instead of $(PWD) and add support for O= option in Makefile tools/power turbostat: modprobe msr, if needed tools/power turbostat: dump MSR_TURBO_RATIO_LIMIT2 tools/power turbostat: use new MSR_TURBO_RATIO_LIMIT names Bluetooth: hidp: Fix regression with older userspace and flags validation config: Enable NEED_DMA_MAP_STATE by default when SWIOTLB is selected perf/x86/intel/pt: Fix and clean up error handling in pt_event_add() ...That solves several merge conflicts: Documentation/DocBook/media/v4l/subdev-formats.xml Documentation/devicetree/bindings/vendor-prefixes.txt drivers/staging/media/mn88473/mn88473.c include/linux/kconfig.h include/uapi/linux/media-bus-format.hThe ones at subdev-formats.xml and media-bus-format.h are not trivial.That's why we opted to merge from DRM. List of files: /linux/drivers/staging/sm750fb/readme

2c33ce009ca2389dbf0535d0672214d09738e35e - Merge Linus master into drm-next

Mon, 20 Apr 2015 03:32:26 +0200

Merge Linus master into drm-nextThe merge is clean, but the arm build fails afterwards,due to API changes in the regulator tree.I've included the patch into the merge to fix the build.Signed-off-by: Dave Airlie List of files: /linux/drivers/staging/sm750fb/readme