Greg Kroah-Hartman d210267741 Merge 3.4-rc5 into staging-next ...

This resolves the conflict in:
	drivers/staging/vt6656/ioctl.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2012-05-02 11:48:07 -07:00

..

lmc

drivers/net: Remove unnecessary k.alloc/v.alloc OOM messages

2012-01-31 16:20:21 -05:00

.gitignore

…

c101.c

drivers/net: Remove unnecessary k.alloc/v.alloc OOM messages

2012-01-31 16:20:21 -05:00

cosa.c

cosa: Update to current logging forms

2011-06-27 00:09:46 -07:00

cosa.h

…

cycx_drv.c

cyclom: Update to current logging forms

2011-06-27 00:09:46 -07:00

cycx_main.c

cyclom: Update to current logging forms

2011-06-27 00:09:46 -07:00

cycx_x25.c

cyclom: Update to current logging forms

2011-06-27 00:09:46 -07:00

dlci.c

Remove all #inclusions of asm/system.h

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

dscc4.c

Remove all #inclusions of asm/system.h

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

farsync.c

drivers/net/wan/farsync.c: add missing iounmap

2012-04-17 22:31:59 -04:00

farsync.h

…

hd64570.c

Remove all #inclusions of asm/system.h

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

hd64570.h

…

hd64572.c

Remove all #inclusions of asm/system.h

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

hd64572.h

…

hdlc_cisco.c

generic_hdlc: Update to current logging forms

2011-06-27 00:09:46 -07:00

hdlc_fr.c

net: replace random_ether_addr() with eth_hw_addr_random()

2012-02-15 15:34:16 -05:00

hdlc_ppp.c

net/wan/hdlc_ppp: use break in switch

2011-08-22 11:30:38 -07:00

hdlc_raw_eth.c

net: replace random_ether_addr() with eth_hw_addr_random()

2012-02-15 15:34:16 -05:00

hdlc_raw.c

…

hdlc_x25.c

wan: make LAPB callbacks const

2011-09-16 19:20:20 -04:00

hdlc.c

generic_hdlc: Update to current logging forms

2011-06-27 00:09:46 -07:00

hostess_sv11.c

wan: Update to current logging forms

2011-06-27 00:09:47 -07:00

ixp4xx_hss.c

ixp4xx_hss: Update to current logging forms

2011-06-27 00:09:47 -07:00

Kconfig

NET: pc300, move to staging as it is broken

2012-04-13 10:57:04 -07:00

lapbether.c

Remove all #inclusions of asm/system.h

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

Makefile

NET: pc300, move to staging as it is broken

2012-04-13 10:57:04 -07:00

n2.c

drivers/net: Remove unnecessary k.alloc/v.alloc OOM messages

2012-01-31 16:20:21 -05:00

pc300too.c

drivers/net: Remove unnecessary k.alloc/v.alloc OOM messages

2012-01-31 16:20:21 -05:00

pci200syn.c

drivers/net: Remove unnecessary k.alloc/v.alloc OOM messages

2012-01-31 16:20:21 -05:00

sbni.c

module_param: make bool parameters really bool (net & drivers/net)

2011-12-19 22:27:29 -05:00

sbni.h

…

sdla.c

Remove all #inclusions of asm/system.h

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

sealevel.c

module_param: make bool parameters really bool (net & drivers/net)

2011-12-19 22:27:29 -05:00

wanxl.c

drivers/net: Remove unnecessary k.alloc/v.alloc OOM messages

2012-01-31 16:20:21 -05:00

wanxl.h

…

wanxlfw.inc_shipped

…

wanxlfw.S

…

x25_asy.c

Remove all #inclusions of asm/system.h

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

x25_asy.h

…

z85230.c

wan: Update to current logging forms

2011-06-27 00:09:47 -07:00

z85230.h

…