Linus Torvalds 60ea7bb007 Merge branch 'parisc-4.6-4' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux ... Pull parisc ftrace fixes from Helge Deller: "This is (most likely) the last pull request for v4.6 for the parisc architecture. It fixes the FTRACE feature for parisc, which is horribly broken since quite some time and doesn't even compile. This patch just fixes the bare minimum (it actually removes more lines than it adds), so that the function tracer works again on 32- and 64bit kernels. I've queued up additional patches on top of this patch which e.g. add the syscall tracer, but those have to wait for the merge window for v4.7." * 'parisc-4.6-4' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux: parisc: Fix ftrace function tracer		2016-04-15 14:51:45 -07:00
..
configs	KEYS: CONFIG_KEYS_DEBUG_PROC_KEYS is no longer an option	2016-02-10 10:13:27 +00:00
include	Merge branch 'parisc-4.6-4' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux	2016-04-15 14:51:45 -07:00
kernel	Merge branch 'parisc-4.6-4' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux	2016-04-15 14:51:45 -07:00
lib	parisc: Unbreak handling exceptions from kernel modules	2016-04-08 22:14:14 +02:00
math-emu	parisc: remove duplicate define	2013-11-07 22:28:15 +01:00
mm	parisc: Unbreak handling exceptions from kernel modules	2016-04-08 22:14:14 +02:00
oprofile	oprofile: more whitespace fixes	2008-10-15 20:55:51 +02:00
defpalo.conf	parisc: switch to gzip-compressed vmlinuz kernel	2013-07-09 22:09:20 +02:00
install.sh	parisc: make "make install" not depend on vmlinux	2013-11-07 22:28:06 +01:00
Kconfig	Merge branch 'parisc-4.6-4' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux	2016-04-15 14:51:45 -07:00
Kconfig.debug	parisc: Fix ftrace function tracer	2016-04-14 17:47:19 +02:00
Makefile	parisc: Fix ftrace function tracer	2016-04-14 17:47:19 +02:00
nm	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00