linux/arch/parisc
David S. Miller c3fa32b976 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/usb/qmi_wwan.c
	include/net/dst.h

Trivial merge conflicts, both were overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-10-23 16:49:34 -04:00
..
configs parisc: enable DEVTMPFS, DEVTMPFS_MOUNT and BLK_DEV_INITRD in defconfigs 2013-10-19 21:37:52 +02:00
hpux [readdir] constify ->actor 2013-06-29 12:57:05 +04:00
include Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-10-23 16:49:34 -04:00
kernel Revert "parisc: Export flush_cache_page() (needed by lustre)" 2013-10-19 21:37:40 +02:00
lib parisc: let probe_kernel_read() capture access to page zero 2013-10-13 17:46:31 +02:00
math-emu parisc: avoid undefined shift in cnv_float.h 2013-01-07 23:06:22 +01:00
mm parisc: optimize variable initialization in do_page_fault 2013-10-13 17:45:40 +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: switch to gzip-compressed vmlinuz kernel 2013-07-09 22:09:20 +02:00
Kconfig Remove GENERIC_HARDIRQ config option 2013-09-13 15:09:52 +02:00
Kconfig.debug consolidate per-arch stack overflow debugging options 2013-07-04 11:25:39 -07:00
Makefile parisc: switch to gzip-compressed vmlinuz kernel 2013-07-09 22:09:20 +02:00
nm