Jiri Kosina e75d660672 Merge branch 'master' into for-next ...

Merge with latest Linus' tree, as I have incoming patches
that fix code that is newer than current HEAD of for-next.

Conflicts:
	drivers/net/ethernet/realtek/r8169.c

2012-04-08 21:48:52 +02:00

..

addr.c

…

addr.h

…

atm_misc.c

atm: eliminate atm_guess_pdu2truesize()

2011-11-26 16:40:30 -05:00

atm_sysfs.c

atm: expose ATM device index in sysfs

2011-05-27 13:07:21 -04:00

br2684.c

atm: br2684: Avoid alignment issues

2011-11-29 00:28:06 -05:00

clip.c

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

common.c

atm: Allow MSG_PEEK for atm sockets

2011-11-22 16:15:49 -05:00

common.h

atm: Introduce vcc_process_recv_queue

2011-11-22 16:15:42 -05:00

ioctl.c

…

Kconfig

…

lec_arpc.h

…

lec.c

net: remove use of ndo_set_multicast_list in drivers

2011-08-17 20:22:03 -07:00

lec.h

atm: fix comments

2012-04-05 17:21:11 -07:00

Makefile

…

mpc.c

net: Remove casts of void *

2011-06-16 23:19:27 -04:00

mpc.h

…

mpoa_caches.c

…

mpoa_caches.h

…

mpoa_proc.c

…

pppoatm.c

ppp: Replace uses of <linux/if_ppp.h> with <linux/ppp-ioctl.h>

2012-03-04 20:41:38 -05:00

proc.c

atomic: use <linux/atomic.h>

2011-07-26 16:49:47 -07:00

protocols.h

…

pvc.c

net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules

2011-10-31 19:30:30 -04:00

raw.c

…

resources.c

atm: correct sysfs 'device' link creation and parent relationships

2010-12-10 15:45:05 -08:00

resources.h

atm: correct sysfs 'device' link creation and parent relationships

2010-12-10 15:45:05 -08:00

signaling.c

…

signaling.h

…

svc.c

net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules

2011-10-31 19:30:30 -04:00