diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-04 08:51:12 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-04 08:51:12 -0400 |
| commit | d597690eef4142cf622fd469859ecc56506119b5 (patch) | |
| tree | e0be5d05994de4b4243a4c76cf6ca13380c3eac3 /MAINTAINERS | |
| parent | 96b585267f552d4b6a28ea8bd75e5ed03deb6e71 (diff) | |
| parent | 9049fc745300c5e2236cbfc69f5e8cadb6f1f57c (diff) | |
| download | lwn-d597690eef4142cf622fd469859ecc56506119b5.tar.gz lwn-d597690eef4142cf622fd469859ecc56506119b5.zip | |
Merge branch 'akpm' (patches from Andrew)
Merge even more updates from Andrew Morton:
- dma-mapping API cleanup
- a few cleanups and misc things
- use jump labels in dynamic-debug
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
dynamic_debug: add jump label support
jump_label: remove bug.h, atomic.h dependencies for HAVE_JUMP_LABEL
arm: jump label may reference text in __exit
tile: support static_key usage in non-module __exit sections
sparc: support static_key usage in non-module __exit sections
powerpc: add explicit #include <asm/asm-compat.h> for jump label
drivers/media/dvb-frontends/cxd2841er.c: avoid misleading gcc warning
MAINTAINERS: update email and list of Samsung HW driver maintainers
block: remove BLK_DEV_DAX config option
samples/kretprobe: fix the wrong type
samples/kretprobe: convert the printk to pr_info/pr_err
samples/jprobe: convert the printk to pr_info/pr_err
samples/kprobe: convert the printk to pr_info/pr_err
dma-mapping: use unsigned long for dma_attrs
media: mtk-vcodec: remove unused dma_attrs
include/linux/bitmap.h: cleanup
tree-wide: replace config_enabled() with IS_ENABLED()
drivers/fpga/Kconfig: fix build failure
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 429fc61bee81..bafc8043d4f0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1648,7 +1648,8 @@ F: arch/arm/mach-s5pv210/ ARM/SAMSUNG S5P SERIES 2D GRAPHICS ACCELERATION (G2D) SUPPORT M: Kyungmin Park <kyungmin.park@samsung.com> -M: Kamil Debski <k.debski@samsung.com> +M: Kamil Debski <kamil@wypas.org> +M: Andrzej Hajda <a.hajda@samsung.com> L: linux-arm-kernel@lists.infradead.org L: linux-media@vger.kernel.org S: Maintained @@ -1656,8 +1657,9 @@ F: drivers/media/platform/s5p-g2d/ ARM/SAMSUNG S5P SERIES Multi Format Codec (MFC) SUPPORT M: Kyungmin Park <kyungmin.park@samsung.com> -M: Kamil Debski <k.debski@samsung.com> +M: Kamil Debski <kamil@wypas.org> M: Jeongtae Park <jtp.park@samsung.com> +M: Andrzej Hajda <a.hajda@samsung.com> L: linux-arm-kernel@lists.infradead.org L: linux-media@vger.kernel.org S: Maintained @@ -9470,7 +9472,8 @@ S: Odd Fixes F: drivers/media/usb/pwc/* PWM FAN DRIVER -M: Kamil Debski <k.debski@samsung.com> +M: Kamil Debski <kamil@wypas.org> +M: Lukasz Majewski <l.majewski@samsung.com> L: linux-hwmon@vger.kernel.org S: Supported F: Documentation/devicetree/bindings/hwmon/pwm-fan.txt @@ -10218,7 +10221,8 @@ T: git https://github.com/lmajewski/linux-samsung-thermal.git F: drivers/thermal/samsung/ SAMSUNG USB2 PHY DRIVER -M: Kamil Debski <k.debski@samsung.com> +M: Kamil Debski <kamil@wypas.org> +M: Sylwester Nawrocki <s.nawrocki@samsung.com> L: linux-kernel@vger.kernel.org S: Supported F: Documentation/devicetree/bindings/phy/samsung-phy.txt |