David S. Miller aa11d958d1 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: arch/microblaze/include/asm/socket.h		2009-08-12 17:44:53 -07:00
..
configs	parisc: update defconfigs	2009-03-13 01:33:34 -04:00
hpux	ptrace: remove PT_DTRACE from avr32, mn10300, parisc, s390, sh, xtensa	2009-06-18 13:03:48 -07:00
include/asm	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-08-12 17:44:53 -07:00
kernel	parisc: Set correct bit in protection flags	2009-08-02 12:36:05 +02:00
lib	parisc: fix mismatched parenthesis in memcpy.c	2009-07-03 03:34:09 +00:00
math-emu	parisc: decode_exc.c should include kernel.h	2009-07-03 03:34:08 +00:00
mm	parisc: fix compile warning in mm/init.c	2009-07-03 03:34:10 +00:00
oprofile	oprofile: more whitespace fixes	2008-10-15 20:55:51 +02:00
defpalo.conf	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
install.sh	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
Kconfig	parisc: use generic atomic64 on 32-bit	2009-07-03 03:34:13 +00:00
Kconfig.debug	alpha/parisc: remove config variable DEBUG_RWLOCK	2008-02-06 10:41:03 -08:00
Makefile	parisc: add ftrace (function and graph tracer) functionality	2009-03-31 02:51:34 +00:00
nm	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00