]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commit - drivers/hid/i2c-hid/i2c-hid.c
Merge tag 'perf-urgent-for-mingo-4.10-20170117' of git://git.kernel.org/pub/scm/linux...
authorIngo Molnar <mingo@kernel.org>
Tue, 17 Jan 2017 15:58:53 +0000 (16:58 +0100)
committerIngo Molnar <mingo@kernel.org>
Tue, 17 Jan 2017 16:03:16 +0000 (17:03 +0100)
commit31f5260a7653e6042ac28578db1c61e84f2d7898
tree5a039c72253ffb0597917ef392dd142efb181b24
parent4e71de7986386d5fd3765458f27d612931f27f5e
parent613f050d68a8ed3c0b18b9568698908ef7bbc1f7
Merge tag 'perf-urgent-for-mingo-4.10-20170117' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent

Pull 'perf probe' fixes from Arnaldo Carvalho de Melo <acme@redhat.com>

  - Show correct locations for 'perf probe' on modules (Masami Hiramatsu)

  - Correctly handle 'perf probe's on GCC generated functions in modules (Masami Hiramatsu)

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>